[platform]: add systemd generator as dependency for all images

Signed-off-by: Lawrence Lee <t-lale@microsoft.com>
sonic-net · Jul 26, 2019 · 52f1d74 · 52f1d74
1 parent 093face
commit 52f1d74
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/platform/barefoot/one-aboot.mk b/platform/barefoot/one-aboot.mk
@@ -4,6 +4,7 @@ SONIC_ONE_ABOOT_IMAGE = sonic-aboot-barefoot.swi
 $(SONIC_ONE_ABOOT_IMAGE)_MACHINE = barefoot
 $(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(BFN_MODULE)
+$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
 $(SONIC_ONE_ABOOT_IMAGE)_LAZY_INSTALLS += $(BFN_PLATFORM_MODULE)
 $(SONIC_ONE_ABOOT_IMAGE)_LAZY_INSTALLS += $(BFN_MONTARA_PLATFORM_MODULE)
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(ARISTA_PLATFORM_MODULE_DRIVERS) \

diff --git a/platform/broadcom/one-aboot.mk b/platform/broadcom/one-aboot.mk
@@ -4,5 +4,6 @@ SONIC_ONE_ABOOT_IMAGE = sonic-aboot-broadcom.swi
 $(SONIC_ONE_ABOOT_IMAGE)_MACHINE = broadcom
 $(SONIC_ONE_ABOOT_IMAGE)_IMAGE_TYPE = aboot
 $(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(BRCM_OPENNSL_KERNEL) $(ARISTA_PLATFORM_MODULE_DRIVERS) $(ARISTA_PLATFORM_MODULE_PYTHON2) $(ARISTA_PLATFORM_MODULE_PYTHON3) $(ARISTA_PLATFORM_MODULE)
+$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
 $(SONIC_ONE_ABOOT_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
 SONIC_INSTALLERS += $(SONIC_ONE_ABOOT_IMAGE)
diff --git a/platform/broadcom/raw-image.mk b/platform/broadcom/raw-image.mk
@@ -4,6 +4,7 @@ SONIC_RAW_IMAGE = sonic-broadcom.raw
 $(SONIC_RAW_IMAGE)_MACHINE = broadcom
 $(SONIC_RAW_IMAGE)_IMAGE_TYPE = raw
 $(SONIC_RAW_IMAGE)_INSTALLS += $(BRCM_OPENNSL_KERNEL)
+$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
 $(SONIC_RAW_IMAGE)_LAZY_INSTALLS += $($(SONIC_ONE_IMAGE)_LAZY_INSTALLS)
 $(SONIC_RAW_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
 SONIC_INSTALLERS += $(SONIC_RAW_IMAGE)
diff --git a/platform/generic/aboot-image.mk b/platform/generic/aboot-image.mk
@@ -3,6 +3,6 @@
 SONIC_GENERIC_ABOOT_IMAGE = sonic-aboot-generic.swi
 $(SONIC_GENERIC_ABOOT_IMAGE)_MACHINE = generic
 $(SONIC_GENERIC_ABOOT_IMAGE)_IMAGE_TYPE = aboot
-$(SONIC_GENERIC_ABOOT_IMAGE)_INSTALLS =
+$(SONIC_GENERIC_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
 $(SONIC_GENERIC_ABOOT_IMAGE)_DOCKERS =
 SONIC_INSTALLERS += $(SONIC_GENERIC_ABOOT_IMAGE)
diff --git a/platform/vs/one-image.mk b/platform/vs/one-image.mk
@@ -1,7 +1,7 @@
 # sonic vs one image installer
 
 SONIC_ONE_IMAGE = sonic-vs.bin
-$(SONIC_ONE_IMAGE)_DEPENDS += $(SYSTEMD_SONIC_GENERATOR)
+$(SONIC_ONE_ABOOT_IMAGE)_INSTALLS += $(SYSTEMD_SONIC_GENERATOR)
 $(SONIC_ONE_IMAGE)_MACHINE = vs
 $(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
 ifeq ($(INSTALL_DEBUG_TOOLS),y)