From 064a7dd226ac7b9b9c889659e41b118221776e94 Mon Sep 17 00:00:00 2001 From: xumia Date: Mon, 13 Feb 2023 03:54:12 +0000 Subject: [PATCH 1/3] [Build] Change the default mirror version config file --- Makefile.work | 1 + scripts/build_mirror_config.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.work b/Makefile.work index a8d3f759360f..2dda7876cc57 100644 --- a/Makefile.work +++ b/Makefile.work @@ -555,6 +555,7 @@ endif export MIRROR_URLS export MIRROR_SECURITY_URLS +export SONIC_VERSION_CONTROL_COMPONENTS %:: | sonic-build-hooks ifneq ($(filter y, $(MULTIARCH_QEMU_ENVIRON) $(CROSS_BUILD_ENVIRON)),) diff --git a/scripts/build_mirror_config.sh b/scripts/build_mirror_config.sh index a1e5900a48b8..f2e38e9eed47 100755 --- a/scripts/build_mirror_config.sh +++ b/scripts/build_mirror_config.sh @@ -6,7 +6,8 @@ export ARCHITECTURE=$2 export DISTRIBUTION=$3 DEFAULT_MIRROR_URL_PREFIX=http://packages.trafficmanager.net -MIRROR_VERSION_FILE=files/build/versions/default/versions-mirror +MIRROR_VERSION_FILE= +[[ "$SONIC_VERSION_CONTROL_COMPONENTS" == *deb* || $SONIC_VERSION_CONTROL_COMPONENTS == *all* ] && MIRROR_VERSION_FILE=files/build/versions/default/versions-mirror [ -f target/versions/default/versions-mirror ] && MIRROR_VERSION_FILE=target/versions/default/versions-mirror # The default mirror urls From 48b4e7289484b7a1fc35f731527f5e72528e5ea4 Mon Sep 17 00:00:00 2001 From: xumia Date: Mon, 13 Feb 2023 04:02:57 +0000 Subject: [PATCH 2/3] Fix wrong bash if syntax issue --- scripts/build_mirror_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_mirror_config.sh b/scripts/build_mirror_config.sh index f2e38e9eed47..9cf5bb8fbcc2 100755 --- a/scripts/build_mirror_config.sh +++ b/scripts/build_mirror_config.sh @@ -7,7 +7,7 @@ export DISTRIBUTION=$3 DEFAULT_MIRROR_URL_PREFIX=http://packages.trafficmanager.net MIRROR_VERSION_FILE= -[[ "$SONIC_VERSION_CONTROL_COMPONENTS" == *deb* || $SONIC_VERSION_CONTROL_COMPONENTS == *all* ] && MIRROR_VERSION_FILE=files/build/versions/default/versions-mirror +[[ "$SONIC_VERSION_CONTROL_COMPONENTS" == *deb* || $SONIC_VERSION_CONTROL_COMPONENTS == *all* ]] && MIRROR_VERSION_FILE=files/build/versions/default/versions-mirror [ -f target/versions/default/versions-mirror ] && MIRROR_VERSION_FILE=target/versions/default/versions-mirror # The default mirror urls From e8cf93eaca98a2b3b022c2a8368cb4342e94f628 Mon Sep 17 00:00:00 2001 From: xumia Date: Mon, 13 Feb 2023 14:36:27 +0000 Subject: [PATCH 3/3] Fix empty file name issue --- scripts/build_mirror_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build_mirror_config.sh b/scripts/build_mirror_config.sh index 9cf5bb8fbcc2..aee56f23ae6a 100755 --- a/scripts/build_mirror_config.sh +++ b/scripts/build_mirror_config.sh @@ -22,7 +22,7 @@ if [ "$ARCHITECTURE" == "armhf" ]; then fi if [ "$MIRROR_SNAPSHOT" == y ]; then - if [ -f $MIRROR_VERSION_FILE ]; then + if [ -f "$MIRROR_VERSION_FILE" ]; then DEBIAN_TIMESTAMP=$(grep "^debian==" $MIRROR_VERSION_FILE | tail -n 1 | sed 's/.*==//') DEBIAN_SECURITY_TIMESTAMP=$(grep "^debian-security==" $MIRROR_VERSION_FILE | tail -n 1 | sed 's/.*==//') elif [ -z "$DEBIAN_TIMESTAMP" ] || [ -z "$DEBIAN_SECURITY_TIMESTAMP" ]; then