From e73ba2015418c37fd97220b009d326e5a79cc78a Mon Sep 17 00:00:00 2001 From: nazunalika Date: Tue, 23 Nov 2021 08:40:26 -0700 Subject: [PATCH] readding sig_compose temporarily --- sync/common_8 | 6 ++++-- sync/minor-release-sync-to-staging.sh | 27 +++++++++++++-------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/sync/common_8 b/sync/common_8 index 906cd94..47a95c8 100644 --- a/sync/common_8 +++ b/sync/common_8 @@ -52,8 +52,10 @@ NONSIG_COMPOSE=( ) declare -A SIG_COMPOSE -#SIG_COMPOSE=( -#) +SIG_COMPOSE=( + [kernel]="kernel/kernel" + [kmod]="kernel/kmod" +) # These repos have modules MODS=( diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh index 8eb39e8..297363f 100644 --- a/sync/minor-release-sync-to-staging.sh +++ b/sync/minor-release-sync-to-staging.sh @@ -27,20 +27,19 @@ done # sync all sig stuff -# Disabled as we will have a different method for sig content and sig content -# is available upstream. -#for SIG in "${!SIG_COMPOSE[@]}"; do -# echo "${SIG}: Syncing" -# cd "/mnt/compose/${MAJ}/latest-${SIG}-${MAJ}/compose" || { echo "${COMPOSE}: Failed to change directory"; break; } -# -# TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${SIG_COMPOSE[$SIG]}" -# mkdir -p "${TARGET}" -# # disabling because none of our files should be starting with dashes. If they -# # are something is *seriously* wrong here. -# # shellcheck disable=SC2035 -# sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \ -# {} "${TARGET}" -#done +# Only enabled for giving preferential treatment. +for SIG in "${!SIG_COMPOSE[@]}"; do + echo "${SIG}: Syncing" + cd "/mnt/compose/${MAJ}/latest-${SIG}-${MAJ}/compose" || { echo "${COMPOSE}: Failed to change directory"; break; } + + TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${SIG_COMPOSE[$SIG]}" + mkdir -p "${TARGET}" + # disabling because none of our files should be starting with dashes. If they + # are something is *seriously* wrong here. + # shellcheck disable=SC2035 + sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \ + {} "${TARGET}" +done # copy around the ISOs a bit, make things comfortable for ARCH in "${ARCHES[@]}"; do