don't build debootstrap from source

liushilongbuaa · Nov 22, 2023 · 5f4132a · 5f4132a
1 parent c8fe658
commit 5f4132a
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 82 deletions.
diff --git a/rules/debootstrap.dep b/rules/debootstrap.dep
diff --git a/rules/debootstrap.mk b/rules/debootstrap.mk
diff --git a/slave.mk b/slave.mk
@@ -1270,7 +1270,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_RFS_TARGETS)) : $(TARGET_PATH)/% : \
         .platform \
         build_debian.sh \
         $(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(INITRAMFS_TOOLS) $(LINUX_KERNEL)) \
-        $(addsuffix -install,$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(DEBOOTSTRAP))) \
         $$(addprefix $(TARGET_PATH)/,$$($$*_DEPENDENT_RFS)) \
         $(call dpkg_depend,$(TARGET_PATH)/%.dep)
 	$(HEADER)
@@ -1356,7 +1355,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
         $$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
         $$(addprefix $(TARGET_PATH)/,$$(SONIC_PACKAGES_LOCAL)) \
         $$(addprefix $(FILES_PATH)/,$$($$*_FILES)) \
-        $(addsuffix -install,$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(DEBOOTSTRAP))) \
         $(if $(findstring y,$(ENABLE_ZTP)),$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(SONIC_ZTP))) \
         $(if $(findstring y,$(INCLUDE_FIPS)),$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(SYMCRYPT_OPENSSL))) \
         $(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_UTILITIES_PY3)) \

diff --git a/sonic-slave-bookworm/Dockerfile.j2 b/sonic-slave-bookworm/Dockerfile.j2
@@ -117,6 +117,7 @@ RUN apt-get update && apt-get install -y \
         uuid-dev \
         jq \
         cron \
+        debootstrap \
 # For sonic-swss-common
         nlohmann-json3-dev \
         libhiredis-dev \

diff --git a/src/debootstrap/.gitignore b/src/debootstrap/.gitignore
diff --git a/src/debootstrap/Makefile b/src/debootstrap/Makefile
diff --git a/src/debootstrap/proc-mount.patch b/src/debootstrap/proc-mount.patch