Skip to content

Commit 963d40a

Browse files
authored
Re-add missing dependency for derived debs. (sonic-net#16896)
* Re-add missing dependency for derived debs. My previous changed removed the whole dependency on the main deb existing, not just the installation of the main deb. Fix this by readding a dependency on the main deb being built/pulled from cache. Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> * Add the kernel and initramfs as dependencies for RFS build Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com> --------- Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
1 parent 5ce2a71 commit 963d40a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Makefile.cache

+1
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ endef
359359

360360
RFS_DEP_FILES := $(wildcard \
361361
$(addprefix scripts/, build_debian_base_system.sh prepare_debian_image_buildinfo.sh build_mirror_config.sh) \
362+
$(addprefix $(IMAGE_DISTRO_DEBS_PATH)/,$(INITRAMFS_TOOLS) $(LINUX_KERNEL)) \
362363
$(shell git ls-files files/initramfs-tools) \
363364
$(shell git ls-files files/image_config) \
364365
$(shell git ls-files files/apparmor) \

slave.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ SONIC_TARGET_LIST += $(addprefix $(DEBS_PATH)/, $(SONIC_DPKG_DEBS))
793793
# we depend on it and move our deb to other targets
794794
# Add new dev package:
795795
# $(eval $(call add_derived_package,$(ORIGINAL_DEB),derived_deb_file.deb))
796-
$(addprefix $(DEBS_PATH)/, $(SONIC_DERIVED_DEBS)) : $(DEBS_PATH)/% : .platform
796+
$(addprefix $(DEBS_PATH)/, $(SONIC_DERIVED_DEBS)) : $(DEBS_PATH)/% : .platform $$(addprefix $(DEBS_PATH)/,$$($$*_DEPENDS))
797797
$(HEADER)
798798
# All noise takes place in main deb recipe, so we are just telling that
799799
# we depend on it

0 commit comments

Comments
 (0)