matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Build] Update SLAVE_BASE_TAG and DPKG cache if Debian mirrors were changed (#12702)

Browse Source 
Why I did it
After #12557 sources.lists are generated.
So we need to recalculate SLAVE_BASE_TAG if mirrors were changed.
Also we need to rebuild DPKG cache in this case.

How I did it
Use generated sources.list for SLAVE_BASE_TAG
Add MIRROR_URLS and MIRROR_SECURITY_URLS to SONIC_COMMON_FLAGS_LIST
This commit is contained in:
Konstantin Vasin 2022-11-15 08:02:34 +03:00 committed by GitHub
parent 672367c33e
commit c63e9fe59c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.cache
View File

@ -70,6 +70,7 @@ SONIC_COMMON_FILES_LIST := $(if $(wildcard cache.skip.common),, .platform slave
SONIC_COMMON_FLAGS_LIST := $(CONFIGURED_PLATFORM) \ SONIC_COMMON_FLAGS_LIST := $(CONFIGURED_PLATFORM) \
$(CONFIGURED_ARCH) \ $(CONFIGURED_ARCH) \
$(BLDENV) \ $(BLDENV) \
$(MIRROR_URLS) $(MIRROR_SECURITY_URLS) \
$(SONIC_DEBUGGING_ON) \ $(SONIC_DEBUGGING_ON) \
$(SONIC_PROFILING_ON) $(SONIC_ENABLE_SYNCD_RPC) $(SONIC_PROFILING_ON) $(SONIC_ENABLE_SYNCD_RPC)
SONIC_COMMON_DPKG_LIST := debian/control debian/changelog debian/rules \ SONIC_COMMON_DPKG_LIST := debian/control debian/changelog debian/rules \

1
Makefile.work
View File

@ -207,6 +207,7 @@ $(shell $(PREPARE_DOCKER) )
# Add the versions in the tag, if the version change, need to rebuild the slave # Add the versions in the tag, if the version change, need to rebuild the slave
SLAVE_BASE_TAG = $(shell \ SLAVE_BASE_TAG = $(shell \
cat $(SLAVE_DIR)/Dockerfile \ cat $(SLAVE_DIR)/Dockerfile \
$(SLAVE_DIR)/sources.list.* \
$(SLAVE_DIR)/buildinfo/versions/versions-* \ $(SLAVE_DIR)/buildinfo/versions/versions-* \
src/sonic-build-hooks/hooks/* 2>/dev/null \ src/sonic-build-hooks/hooks/* 2>/dev/null \
| sha1sum \ | sha1sum \