Skip to content

Commit 9ffd1af

Browse files
k-v1saiarcot895
authored andcommitted
don't build debootstrap from source
1 parent ee02f1a commit 9ffd1af

File tree

7 files changed

+1
-82
lines changed

7 files changed

+1
-82
lines changed

rules/debootstrap.dep

-10
This file was deleted.

rules/debootstrap.mk

-9
This file was deleted.

slave.mk

-2
Original file line numberDiff line numberDiff line change
@@ -1270,7 +1270,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_RFS_TARGETS)) : $(TARGET_PATH)/% : \
12701270
.platform \
12711271
build_debian.sh \
12721272
$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(INITRAMFS_TOOLS) $(LINUX_KERNEL)) \
1273-
$(addsuffix -install,$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(DEBOOTSTRAP))) \
12741273
$$(addprefix $(TARGET_PATH)/,$$($$*_DEPENDENT_RFS)) \
12751274
$(call dpkg_depend,$(TARGET_PATH)/%.dep)
12761275
$(HEADER)
@@ -1356,7 +1355,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
13561355
$$(addprefix $(TARGET_PATH)/,$$($$*_DOCKERS)) \
13571356
$$(addprefix $(TARGET_PATH)/,$$(SONIC_PACKAGES_LOCAL)) \
13581357
$$(addprefix $(FILES_PATH)/,$$($$*_FILES)) \
1359-
$(addsuffix -install,$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(DEBOOTSTRAP))) \
13601358
$(if $(findstring y,$(ENABLE_ZTP)),$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(SONIC_ZTP))) \
13611359
$(if $(findstring y,$(INCLUDE_FIPS)),$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(SYMCRYPT_OPENSSL))) \
13621360
$(addprefix $(PYTHON_WHEELS_PATH)/,$(SONIC_UTILITIES_PY3)) \

sonic-slave-bookworm/Dockerfile.j2

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ RUN apt-get update && apt-get install -y \
117117
uuid-dev \
118118
jq \
119119
cron \
120+
debootstrap \
120121
# For sonic-swss-common
121122
nlohmann-json3-dev \
122123
libhiredis-dev \

src/debootstrap/.gitignore

-3
This file was deleted.

src/debootstrap/Makefile

-24
This file was deleted.

src/debootstrap/proc-mount.patch

-34
This file was deleted.

0 commit comments

Comments
 (0)