From 9ae77bc2dd636cd50413c3a97a83cfb2775a0e65 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Fri, 13 Oct 2023 10:16:45 -0700 Subject: [PATCH] Remove main deb installation for derived deb build (#16859) * Don't install dependencies of derived debs When "building" a derived deb package, don't install the dependencies of the package into the container. It's not needed at this stage. * Re-add openssh-client and openssh-sftp-server as derived debs Signed-off-by: Saikrishna Arcot --------- Signed-off-by: Saikrishna Arcot --- rules/openssh.mk | 4 ++-- slave.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules/openssh.mk b/rules/openssh.mk index b86fc79d64..5609bf34e4 100644 --- a/rules/openssh.mk +++ b/rules/openssh.mk @@ -10,10 +10,10 @@ $(OPENSSH_SERVER)_DEPENDS += $(LIBNL3_DEV) $(LIBNL_ROUTE3_DEV) SONIC_MAKE_DEBS += $(OPENSSH_SERVER) OPENSSH_CLIENT = openssh-client_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb -#$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_CLIENT))) +$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_CLIENT))) OPENSSH_SFTP_SERVER = openssh-sftp-server_$(OPENSSH_VERSION)_$(CONFIGURED_ARCH).deb -#$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_SFTP_SERVER))) +$(eval $(call add_derived_package,$(OPENSSH_SERVER),$(OPENSSH_SFTP_SERVER))) # The .c, .cpp, .h & .hpp files under src/{$DBG_SRC_ARCHIVE list} # are archived into debug one image to facilitate debugging. diff --git a/slave.mk b/slave.mk index 069c83eec6..163f7346b3 100644 --- a/slave.mk +++ b/slave.mk @@ -793,7 +793,7 @@ SONIC_TARGET_LIST += $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS)) # we depend on it and move our deb to other targets # Add new dev package: # $(eval $(call add_derived_package,$(ORIGINAL_DEB),derived_deb_file.deb)) -$(addprefix $(DEBS_PATH)/, $(SONIC_DERIVED_DEBS)) : $(DEBS_PATH)/% : .platform $$(addsuffix -install,$$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))) +$(addprefix $(DEBS_PATH)/, $(SONIC_DERIVED_DEBS)) : $(DEBS_PATH)/% : .platform $(HEADER) # All noise takes place in main deb recipe, so we are just telling that # we depend on it