rename single image to one image (#220)

* rename single image to one image
sonic-net · Feb 1, 2017 · 1786a33 · 1786a33
1 parent c2b4c87
commit 1786a33
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/platform/broadcom/one-image.mk b/platform/broadcom/one-image.mk
@@ -0,0 +1,8 @@
+# sonic broadcom one image installer
+
+SONIC_ONE_IMAGE = sonic-broadcom.bin
+$(SONIC_ONE_IMAGE)_MACHINE = broadcom
+$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
+$(SONIC_ONE_IMAGE)_DEPENDS += $(BRCM_OPENNSL_KERNEL) 
+$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
+SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)
diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
@@ -2,7 +2,7 @@ include $(PLATFORM_PATH)/sdk.mk
 include $(PLATFORM_PATH)/sai.mk
 include $(PLATFORM_PATH)/docker-orchagent-brcm.mk
 include $(PLATFORM_PATH)/docker-syncd-brcm.mk
-include $(PLATFORM_PATH)/single-image.mk
+include $(PLATFORM_PATH)/one-image.mk
 
 BCMCMD = bcmcmd
 $(BCMCMD)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmcmd?sv=2015-04-05&sr=b&sig=X3bFApmsNFmcnWM9mSGRxBugPcg%2FgJCHh5hhSuV1M2c%3D&se=2030-08-23T14%3A41%3A56Z&sp=r"
@@ -12,7 +12,7 @@ $(DSSERVE)_URL = "https://sonicstorage.blob.core.windows.net/packages/dsserve?sv
 
 SONIC_ONLINE_FILES += $(BCMCMD) $(DSSERVE)
 
-SONIC_ALL += $(SONIC_SINGLE_IMAGE)
+SONIC_ALL += $(SONIC_ONE_IMAGE)
 
 # Inject brcm sai into sairedis
 $(LIBSAIREDIS)_DEPENDS += $(BRCM_OPENNSL) $(BRCM_SAI) $(BRCM_SAI_DEV)

diff --git a/platform/broadcom/single-image.mk b/platform/broadcom/single-image.mk
diff --git a/platform/cavium/one-image.mk b/platform/cavium/one-image.mk
@@ -0,0 +1,8 @@
+# sonic cavium one image installer
+
+SONIC_ONE_IMAGE = sonic-cavium.bin
+$(SONIC_ONE_IMAGE)_MACHINE = cavium
+$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
+$(SONIC_ONE_IMAGE)_DEPENDS += $(CAVM_PLATFORM_DEB) 
+$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
+SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)
diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk
@@ -2,9 +2,9 @@ include $(PLATFORM_PATH)/cavm-sai.mk
 include $(PLATFORM_PATH)/docker-syncd-cavm.mk
 include $(PLATFORM_PATH)/docker-orchagent-cavm.mk
 include $(PLATFORM_PATH)/cavm_platform_modules.mk
-include $(PLATFORM_PATH)/single-image.mk
+include $(PLATFORM_PATH)/one-image.mk
 
-SONIC_ALL += $(SONIC_SINGLE_IMAGE)
+SONIC_ALL += $(SONIC_ONE_IMAGE)
 
 # Inject cavium sai into sairedis
 $(LIBSAIREDIS)_DEPENDS += $(CAVM_SAI) $(CAVM_LIBSAI)

diff --git a/platform/cavium/single-image.mk b/platform/cavium/single-image.mk
diff --git a/platform/mellanox/one-image.mk b/platform/mellanox/one-image.mk
@@ -0,0 +1,8 @@
+# sonic mellanox one image installer
+
+SONIC_ONE_IMAGE = sonic-mellanox.bin
+$(SONIC_ONE_IMAGE)_MACHINE = mellanox
+$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
+$(SONIC_ONE_IMAGE)_DEPENDS += $(SX_KERNEL) $(KERNEL_MFT) $(MFT) $(MLNX_HW_MANAGEMENT)
+$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
+SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
@@ -5,9 +5,9 @@ include $(PLATFORM_PATH)/mlnx-sai.mk
 include $(PLATFORM_PATH)/hw-management.mk
 include $(PLATFORM_PATH)/docker-syncd-mlnx.mk
 include $(PLATFORM_PATH)/docker-orchagent-mlnx.mk
-include $(PLATFORM_PATH)/single-image.mk
+include $(PLATFORM_PATH)/one-image.mk
 
-SONIC_ALL += $(SONIC_SINGLE_IMAGE)
+SONIC_ALL += $(SONIC_ONE_IMAGE)
 
 # Inject mlnx sai into sairedis
 $(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI)

diff --git a/platform/mellanox/single-image.mk b/platform/mellanox/single-image.mk