From fb8f36098eb73535fcbc5e2d7885e3038401dc96 Mon Sep 17 00:00:00 2001 From: George Mileka Date: Wed, 20 Sep 2023 13:19:35 -0700 Subject: [PATCH] Temporarily rewind cmake version to get a test build going. --- toolkit/resources/manifests/package/toolchain_aarch64.txt | 4 ++-- toolkit/tools/pkgworker/pkgworker.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 60dbd57bf02..88acf68a0ea 100644 --- 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 index 6219d6b1e91..a06d6eeece3 100644 --- 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.") } }