From 82e9a4c5f422f3ba118a9d7ccdbd2319c047673a Mon Sep 17 00:00:00 2001 From: xumia Date: Fri, 7 Apr 2023 01:55:37 +0000 Subject: [PATCH 1/3] Optimize the version control for debian packages --- src/sonic-build-hooks/scripts/buildinfo_base.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sonic-build-hooks/scripts/buildinfo_base.sh b/src/sonic-build-hooks/scripts/buildinfo_base.sh index da1bc54226f..f500b6f21cb 100755 --- a/src/sonic-build-hooks/scripts/buildinfo_base.sh +++ b/src/sonic-build-hooks/scripts/buildinfo_base.sh @@ -382,6 +382,9 @@ update_version_file() update_version_files() { local version_names="versions-deb versions-py2 versions-py3" + if [ "$MIRROR_SNAPSHOT" == y ]; then + version_names="versions-py2 versions-py3" + fi for version_name in $version_names; do update_version_file $version_name done From a5033aaefa52f4a5c3d0ad12d2cf745c9c9b4ef8 Mon Sep 17 00:00:00 2001 From: xumia Date: Mon, 10 Apr 2023 01:50:09 +0000 Subject: [PATCH 2/3] Fix sonic-slave-buster/sources.list.amd64 not found issue --- scripts/prepare_docker_buildinfo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepare_docker_buildinfo.sh b/scripts/prepare_docker_buildinfo.sh index 23e664affa1..8e8b461984a 100755 --- a/scripts/prepare_docker_buildinfo.sh +++ b/scripts/prepare_docker_buildinfo.sh @@ -38,7 +38,7 @@ if [ -z "$DISTRO" ]; then fi fi -if [[ "$IMAGENAME" == docker-base-* ]] || [[ "$IMAGENAME" == docker-ptf ]]; then +if [[ "$IMAGENAME" == sonic-slave-* ]] || [[ "$IMAGENAME" == docker-base-* ]] || [[ "$IMAGENAME" == docker-ptf ]]; then scripts/build_mirror_config.sh ${DOCKERFILE_PATH} $ARCH $DISTRO fi From 98ae46ea23c7ba3c90939b50f8ca3449ff8cf87a Mon Sep 17 00:00:00 2001 From: xumia Date: Mon, 10 Apr 2023 04:31:55 +0000 Subject: [PATCH 3/3] Fix variable not exposed issue --- Makefile.work | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.work b/Makefile.work index 4d7a4ff58a7..dd0d083d475 100644 --- a/Makefile.work +++ b/Makefile.work @@ -224,6 +224,7 @@ PREPARE_DOCKER=BUILD_SLAVE=y \ DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \ SONIC_VERSION_CACHE=$(SONIC_VERSION_CACHE) \ DBGOPT='$(DBGOPT)' \ + MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \ scripts/prepare_docker_buildinfo.sh \ $(SLAVE_BASE_IMAGE) \ $(SLAVE_DIR)/Dockerfile \