From 671a02d60cc5b0b29d1acc9f45c611277f5898f1 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Thu, 12 May 2022 00:18:34 -0700 Subject: [PATCH] fix up NFV a bit --- sync/common_8 | 7 ++++++- sync/minor-release-sync-to-staging.sh | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sync/common_8 b/sync/common_8 index 8431a0f..2a8fe96 100644 --- a/sync/common_8 +++ b/sync/common_8 @@ -22,11 +22,15 @@ RELEASE_DIR="${CATEGORY_STUB}/${REVISION}${APPEND_TO_DIR}" NONMODS_REPOS=( Extras Devel - nfv plus rockyrpi ) +# These repos were originally separate from the main compose and need symlinks +LINK_REPOS=( + [NFV]="nfv" +) + # These repos have comps/groups, except for debuginfo and sources MODS_REPOS=( BaseOS @@ -35,6 +39,7 @@ MODS_REPOS=( ResilientStorage PowerTools RT + NFV ) ALL_REPOS=( diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh index 297363f..13a8cfa 100644 --- a/sync/minor-release-sync-to-staging.sh +++ b/sync/minor-release-sync-to-staging.sh @@ -41,6 +41,12 @@ for SIG in "${!SIG_COMPOSE[@]}"; do {} "${TARGET}" done +# Create symlinks for repos that were once separate from the main compose +for LINK in "${LINK_REPOS[@]}"; do + ln -sr "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${LINK}" \ + "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${LINK_REPOS[$LINK]}" +done + # copy around the ISOs a bit, make things comfortable for ARCH in "${ARCHES[@]}"; do TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/isos/${ARCH}"