Temporarily rewind cmake version to get a test build going.

microsoft · Sep 20, 2023 · fb8f360 · fb8f360
1 parent 7c2fc2b
commit fb8f360
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@@ -30,8 +30,8 @@ check-debuginfo-0.15.2-1.cm2.aarch64.rpm
 chkconfig-1.20-3.cm2.aarch64.rpm
 chkconfig-debuginfo-1.20-3.cm2.aarch64.rpm
 chkconfig-lang-1.20-3.cm2.aarch64.rpm
-cmake-3.21.4-8.cm2.aarch64.rpm
-cmake-debuginfo-3.21.4-8.cm2.aarch64.rpm
+cmake-3.21.4-7.cm2.aarch64.rpm
+cmake-debuginfo-3.21.4-7.cm2.aarch64.rpm
 coreutils-8.32-6.cm2.aarch64.rpm
 coreutils-debuginfo-8.32-6.cm2.aarch64.rpm
 coreutils-lang-8.32-6.cm2.aarch64.rpm

diff --git a/toolkit/tools/pkgworker/pkgworker.go b/toolkit/tools/pkgworker/pkgworker.go
@@ -283,7 +283,7 @@ func installCCache(ccacheDirTarsIn string, ccacheGroupName string, architecture
 		var ccacheVersionFullBlobName = architecture + "/" + remoteStoreConfig.VersionsFolder + "/" + ccacheGroupName + CCacheVersionSuffix
 		var ccacheInputVersionFullPath = ccacheDirTarsIn + "/" + ccacheGroupName + CCacheVersionSuffix
 
-		logger.Log.Infof("  downloading  (%s) to (%s)...", ccacheVersionFullBlobName, ccacheInputVersionFullPath)
+		logger.Log.Infof("  downloading (%s) to (%s)...", ccacheVersionFullBlobName, ccacheInputVersionFullPath)
 		downloadStartTime := time.Now()
 		err = download(theClient, context.Background(), remoteStoreConfig.ContainerName, ccacheVersionFullBlobName, ccacheInputVersionFullPath)
 		if err != nil {
@@ -509,7 +509,7 @@ func buildSRPMInChroot(chrootDir, rpmDirPath, toolchainDirPath, workerTar, srpmF
 	if useCcache {
 		err = installCCache(*ccacheDirTarsIn, *ccacheGroupName, outArch)
 		if err != nil {
-			logger.Log.Warnf("ccache will be disabled.")
+			logger.Log.Warnf("ccache will not be able to use previously generated artifacts.")
 		}
 	}