Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[build] refactoring of 1st stage rfs split build #17100

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[build] refactoring of 1st stage rfs split build #17100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5652e29
make sonic-build-hooks reproducible
k-v1 Oct 29, 2023
042a908
enable pigz by default
k-v1 Oct 20, 2023
5f07338
pass DBGOPT to slave.mk
k-v1 Nov 4, 2023
57f0cef
split rfs refactoring
k-v1 Nov 6, 2023
ba3949a
allow to disable DPKG cache for RFS using option SONIC_ENABLE_RFS_DPK…
k-v1 Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ rules/config.user

# Build artifacts
fsroot/
fsroot-*/
fs.*
target/
*.deb
Expand Down
31 changes: 13 additions & 18 deletions Makefile.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,23 +357,18 @@ define SAVE_CACHE
$(if $(call CHECK_WCACHE_ENABLED,$(1)), $(call SAVE_INTO_CACHE,$(1),$(2)))
endef

RFS_DEP_FILES := $(wildcard \
ifeq ($(SONIC_ENABLE_RFS_DPKG_CACHE),y)
RFS_CACHE_MODE := GIT_CONTENT_SHA
else
RFS_CACHE_MODE := none
endif
RFS_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(SONIC_VERSION_CONTROL_COMPONENTS) $(MIRROR_SNAPSHOT)
RFS_DEP_FILES := $(SONIC_COMMON_FILES_LIST) $(SONIC_COMMON_BASE_FILES_LIST) \
build_rfs.sh functions.sh \
$(addprefix scripts/, build_debian_base_system.sh prepare_debian_image_buildinfo.sh build_mirror_config.sh) \
$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(INITRAMFS_TOOLS) $(LINUX_KERNEL)) \
$(shell git ls-files files/initramfs-tools) \
$(shell git ls-files files/image_config) \
$(shell git ls-files files/apparmor) \
$(wildcard src/sonic-build-hooks/buildinfo/sonic-build-hooks_*_all.deb) \
$(shell git ls-files files/apt) \
$(shell git ls-files files/sshd) \
$(shell git ls-files files/dhcp) \
src/sonic-build-hooks/buildinfo/trusted.gpg.d \
platform/$(CONFIGURED_PLATFORM)/modules \
files/docker/docker.service.conf \
files/build_templates/default_users.json.j2 \
files/build_scripts/generate_asic_config_checksum.py \
files/scripts/core_cleanup.py \
build_debian.sh onie-image.conf)

$(wildcard files/build/versions/default/* files/build/versions/host-base-image/* files/build/versions/host-image/*)

# Set the target path for each target.
$(foreach pkg, $(SONIC_MAKE_DEBS) $(SONIC_DPKG_DEBS) $(SONIC_ONLINE_DEBS) $(SONIC_COPY_DEBS), \
Expand Down Expand Up @@ -402,9 +397,9 @@ $(foreach pkg, $(SONIC_INSTALL_PKGS), \

$(foreach pkg, $(SONIC_RFS_TARGETS), \
$(eval $(pkg)_DST_PATH := $(if $($(pkg)_DST_PATH), $($(pkg)_DST_PATH), $(TARGET_PATH))) \
$(eval $(pkg)_CACHE_MODE := GIT_CONTENT_SHA) \
$(eval $(pkg)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)) \
$(eval $(pkg)_DEP_FILES := $(SONIC_COMMON_BASE_FILES_LIST) $(RFS_DEP_FILES)) \
$(eval $(pkg)_CACHE_MODE := $(RFS_CACHE_MODE)) \
$(eval $(pkg)_DEP_FLAGS := $(RFS_DEP_FLAGS)) \
$(eval $(pkg)_DEP_FILES := $(RFS_DEP_FILES)) \
$(eval $(TARGET_PATH)/$(pkg)_TARGET := $(pkg)) )

# define the DEP files(.dep and .smdep) and SHA files (.sha and smsha) for each target
Expand Down
11 changes: 2 additions & 9 deletions Makefile.work
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@
# * ENABLE_BOOTCHART: Enable SONiC bootchart
# * Default: n
# * Values: y,n
# * GZ_COMPRESS_PROGRAM: Select pigz to reduce build time
# * Default: gzip
# * Values: pigz,gzip
# * UNATTENDED: Don't wait for interactive input from terminal, setting this
# * value to anything will enable it
# * Default: unset
Expand Down Expand Up @@ -151,10 +148,6 @@ ifeq ($(LEGACY_SONIC_MGMT_DOCKER),)
override LEGACY_SONIC_MGMT_DOCKER = y
endif

ifneq ($(GZ_COMPRESS_PROGRAM), pigz)
override GZ_COMPRESS_PROGRAM = gzip
endif

ifeq ($(CONFIGURED_ARCH),amd64)
SLAVE_BASE_IMAGE = $(SLAVE_DIR)
MULTIARCH_QEMU_ENVIRON = n
Expand Down Expand Up @@ -217,7 +210,6 @@ $(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
INCLUDE_FIPS=$(INCLUDE_FIPS) \
DOCKER_EXTRA_OPTS=$(DOCKER_EXTRA_OPTS) \
DEFAULT_CONTAINER_REGISTRY=$(DEFAULT_CONTAINER_REGISTRY) \
GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \
j2 $(SLAVE_DIR)/Dockerfile.j2 > $(SLAVE_DIR)/Dockerfile)

$(shell CONFIGURED_ARCH=$(CONFIGURED_ARCH) \
Expand Down Expand Up @@ -502,6 +494,7 @@ SONIC_SLAVE_USER_BUILD = \

SONIC_BUILD_INSTRUCTION := $(MAKE) \
-f slave.mk \
DBGOPT='$(DBGOPT)' \
PLATFORM=$(PLATFORM) \
PLATFORM_ARCH=$(PLATFORM_ARCH) \
MULTIARCH_QEMU_ENVIRON=$(MULTIARCH_QEMU_ENVIRON) \
Expand Down Expand Up @@ -534,6 +527,7 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
KERNEL_PROCURE_METHOD=$(KERNEL_PROCURE_METHOD) \
SONIC_DPKG_CACHE_METHOD=$(SONIC_DPKG_CACHE_METHOD) \
SONIC_DPKG_CACHE_SOURCE=$(SONIC_DPKG_CACHE_SOURCE) \
SONIC_ENABLE_RFS_DPKG_CACHE=$(SONIC_ENABLE_RFS_DPKG_CACHE) \
HTTP_PROXY=$(http_proxy) \
HTTPS_PROXY=$(https_proxy) \
NO_PROXY=$(no_proxy) \
Expand Down Expand Up @@ -573,7 +567,6 @@ SONIC_BUILD_INSTRUCTION := $(MAKE) \
SONIC_SLAVE_DOCKER_DRIVER=$(SONIC_SLAVE_DOCKER_DRIVER) \
MIRROR_URLS=$(MIRROR_URLS) \
MIRROR_SECURITY_URLS=$(MIRROR_SECURITY_URLS) \
GZ_COMPRESS_PROGRAM=$(GZ_COMPRESS_PROGRAM) \
MIRROR_SNAPSHOT=$(MIRROR_SNAPSHOT) \
SONIC_VERSION_CONTROL_COMPONENTS=$(SONIC_VERSION_CONTROL_COMPONENTS) \
ONIE_IMAGE_PART_SIZE=$(ONIE_IMAGE_PART_SIZE) \
Expand Down
Loading