From f6ed5c91ef16414d0702796cf600b706a117a717 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sat, 24 Dec 2016 21:45:55 +0000 Subject: [PATCH 1/5] add download url for broadcom sai/sdk deb packages --- platform/broadcom/rules.mk | 3 ++- platform/broadcom/sai.mk | 12 +++++++----- platform/broadcom/sdk.mk | 16 +++++++++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk index 3ad72308b56f..82fa1a8834d5 100644 --- a/platform/broadcom/rules.mk +++ b/platform/broadcom/rules.mk @@ -13,7 +13,8 @@ $(BRCM_BCMCMD)_PATH = $(PLATFORM_PATH)/sdk SONIC_COPY_FILES += $(BRCM_DSSERVE) $(BRCM_BCMCMD) SONIC_ALL += $(DOCKER_SYNCD_BRCM) \ - $(DOCKER_ORCHAGENT_BRCM) + $(DOCKER_ORCHAGENT_BRCM) \ + debs/$(BRCM_OPENNSL_KERNEL) # Inject brcm sai into sairedis $(LIBSAIREDIS)_DEPENDS += $(BRCM_OPENNSL) $(BRCM_SAI) $(BRCM_SAI_DEV) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index ecedb48edd7a..3168ab233297 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,10 +1,12 @@ -BRCM_SAI = libsaibcm_2.0.3.7~20161214010054.112_amd64.deb -$(BRCM_SAI)_PATH = $(PLATFORM_PATH)/sdk -BRCM_SAI_DEV = libsaibcm-dev_2.0.3.7~20161214010054.112_amd64.deb -$(BRCM_SAI_DEV)_PATH = $(PLATFORM_PATH)/sdk +BRCM_SAI = libsaibcm_2.0.3.7_amd64.deb +$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_2.0.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=3S9pY5Allql4fguipFdilJ%2BzP%2Ff4dvUFe3mNY3uhCIc%3D&se=2030-09-02T21%3A43%3A38Z&sp=r" + +BRCM_SAI_DEV = libsaibcm-dev_2.0.3.7_amd64.deb +$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_2.0.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=ztk12uK%2BN1LpCqsZM35YBs8m90OCPWMsjj%2FnY3IcJ7g%3D&se=2030-09-02T21%3A44%3A18Z&sp=r" + $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) -SONIC_COPY_DEBS += $(BRCM_SAI) +SONIC_ONLINE_DEBS += $(BRCM_SAI) $(BRCM_SAI)_DEPENDS += $(BRCM_OPENNSL) $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI) diff --git a/platform/broadcom/sdk.mk b/platform/broadcom/sdk.mk index d3d94e606a64..0747b596fdfd 100644 --- a/platform/broadcom/sdk.mk +++ b/platform/broadcom/sdk.mk @@ -1,4 +1,14 @@ -BRCM_OPENNSL = libopennsl_3.2.1.5+0~20161214000201.54~1.gbpb514c3_amd64.deb -$(BRCM_OPENNSL)_PATH = $(PLATFORM_PATH)/sdk +BRCM_OPENNSL = libopennsl_3.2.1.5_amd64.deb +$(BRCM_OPENNSL)_URL = "https://sonicstorage.blob.core.windows.net/packages/libopennsl_3.2.1.5_amd64.deb?sv=2015-04-05&sr=b&sig=qm6%2BkiGuRGsFKwZcUz6yEtbgbbwQuhxEr0chLM7qJEQ%3D&se=2030-09-02T21%3A41%3A11Z&sp=r" -SONIC_COPY_DEBS += $(BRCM_OPENNSL) +BRCM_OPENNSL_KERNEL = opennsl-modules-3.16.0-4-amd64_3.2.1.5_amd64.deb +$(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-3.16.0-4-amd64_3.2.1.5_amd64.deb?sv=2015-04-05&sr=b&sig=c8hO5PQpvod7IX3aYOiyvFB9rICxDgGiFF5g3GDHx84%3D&se=2030-09-02T21%3A42%3A34Z&sp=r" + +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" + +DSSERVE = dsserve +$(DSSERVE)_URL = "https://sonicstorage.blob.core.windows.net/packages/dsserve?sv=2015-04-05&sr=b&sig=aMlnRA%2FXZNmHPgmOj%2FNMJMYLWyvva1QrN4HcsVXvqKA%3D&se=2030-08-23T14%3A42%3A32Z&sp=r" + +SONIC_ONLINE_DEBS += $(BRCM_OPENNSL) $(BRCM_OPENNSL_KERNEL) +SONIC_ONLINE_FILES += $(BCMCMD) $(DSSERVE) From 146c0faa0b36c09e324d02224d986e4f70ed60f0 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sun, 25 Dec 2016 04:37:51 +0000 Subject: [PATCH 2/5] remove duplicate dsserve bcmcmd objects --- platform/broadcom/rules.mk | 11 ++++++----- platform/broadcom/sdk.mk | 7 ------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk index 82fa1a8834d5..d1865d2eaf55 100644 --- a/platform/broadcom/rules.mk +++ b/platform/broadcom/rules.mk @@ -5,12 +5,13 @@ include $(PLATFORM_PATH)/sai.mk include $(PLATFORM_PATH)/docker-orchagent-brcm.mk include $(PLATFORM_PATH)/docker-syncd-brcm.mk -BRCM_DSSERVE = dsserve -$(BRCM_DSSERVE)_PATH = $(PLATFORM_PATH)/sdk -BRCM_BCMCMD = bcmcmd -$(BRCM_BCMCMD)_PATH = $(PLATFORM_PATH)/sdk +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" -SONIC_COPY_FILES += $(BRCM_DSSERVE) $(BRCM_BCMCMD) +DSSERVE = dsserve +$(DSSERVE)_URL = "https://sonicstorage.blob.core.windows.net/packages/dsserve?sv=2015-04-05&sr=b&sig=aMlnRA%2FXZNmHPgmOj%2FNMJMYLWyvva1QrN4HcsVXvqKA%3D&se=2030-08-23T14%3A42%3A32Z&sp=r" + +SONIC_ONLINE_FILES += $(BCMCMD) $(DSSERVE) SONIC_ALL += $(DOCKER_SYNCD_BRCM) \ $(DOCKER_ORCHAGENT_BRCM) \ diff --git a/platform/broadcom/sdk.mk b/platform/broadcom/sdk.mk index 0747b596fdfd..7778e2cf5376 100644 --- a/platform/broadcom/sdk.mk +++ b/platform/broadcom/sdk.mk @@ -4,11 +4,4 @@ $(BRCM_OPENNSL)_URL = "https://sonicstorage.blob.core.windows.net/packages/libop BRCM_OPENNSL_KERNEL = opennsl-modules-3.16.0-4-amd64_3.2.1.5_amd64.deb $(BRCM_OPENNSL_KERNEL)_URL = "https://sonicstorage.blob.core.windows.net/packages/opennsl-modules-3.16.0-4-amd64_3.2.1.5_amd64.deb?sv=2015-04-05&sr=b&sig=c8hO5PQpvod7IX3aYOiyvFB9rICxDgGiFF5g3GDHx84%3D&se=2030-09-02T21%3A42%3A34Z&sp=r" -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" - -DSSERVE = dsserve -$(DSSERVE)_URL = "https://sonicstorage.blob.core.windows.net/packages/dsserve?sv=2015-04-05&sr=b&sig=aMlnRA%2FXZNmHPgmOj%2FNMJMYLWyvva1QrN4HcsVXvqKA%3D&se=2030-08-23T14%3A42%3A32Z&sp=r" - SONIC_ONLINE_DEBS += $(BRCM_OPENNSL) $(BRCM_OPENNSL_KERNEL) -SONIC_ONLINE_FILES += $(BCMCMD) $(DSSERVE) From c3d2e820b1f49356311f4c23531b25c156282ef8 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sun, 25 Dec 2016 04:52:51 +0000 Subject: [PATCH 3/5] fix libsaibcm-dev download url --- platform/broadcom/sai.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 3168ab233297..acba81fb8416 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -2,7 +2,7 @@ BRCM_SAI = libsaibcm_2.0.3.7_amd64.deb $(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_2.0.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=3S9pY5Allql4fguipFdilJ%2BzP%2Ff4dvUFe3mNY3uhCIc%3D&se=2030-09-02T21%3A43%3A38Z&sp=r" BRCM_SAI_DEV = libsaibcm-dev_2.0.3.7_amd64.deb -$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_2.0.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=ztk12uK%2BN1LpCqsZM35YBs8m90OCPWMsjj%2FnY3IcJ7g%3D&se=2030-09-02T21%3A44%3A18Z&sp=r" +$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_2.0.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=KI8DfgGW8%2BOoZL6tJ9aJa%2F3RvHi%2FXD8gtOcDUD5nOPA%3D&se=2030-09-03T04%3A52%3A41Z&sp=r" $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) From 9ee460c43bc4aec451d04c1d404e2e2a720bd29c Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sun, 25 Dec 2016 06:41:56 +0000 Subject: [PATCH 4/5] fix brcm_sai_dev url --- platform/broadcom/sai.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index acba81fb8416..2185edefe2b1 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -2,10 +2,11 @@ BRCM_SAI = libsaibcm_2.0.3.7_amd64.deb $(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_2.0.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=3S9pY5Allql4fguipFdilJ%2BzP%2Ff4dvUFe3mNY3uhCIc%3D&se=2030-09-02T21%3A43%3A38Z&sp=r" BRCM_SAI_DEV = libsaibcm-dev_2.0.3.7_amd64.deb -$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_2.0.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=KI8DfgGW8%2BOoZL6tJ9aJa%2F3RvHi%2FXD8gtOcDUD5nOPA%3D&se=2030-09-03T04%3A52%3A41Z&sp=r" $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) +$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_2.0.3.7_amd64.deb?sv=2015-04-05&sr=b&sig=KI8DfgGW8%2BOoZL6tJ9aJa%2F3RvHi%2FXD8gtOcDUD5nOPA%3D&se=2030-09-03T04%3A52%3A41Z&sp=r" + SONIC_ONLINE_DEBS += $(BRCM_SAI) $(BRCM_SAI)_DEPENDS += $(BRCM_OPENNSL) From be68b42043ede3f9143dff4d0de1854c4237edce Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Sun, 25 Dec 2016 07:32:54 +0000 Subject: [PATCH 5/5] add bcmcmd and dsserve to docker-syncd-brcm --- platform/broadcom/docker-syncd-brcm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/docker-syncd-brcm.mk b/platform/broadcom/docker-syncd-brcm.mk index 42fe63c86a44..e1f02c59fa12 100644 --- a/platform/broadcom/docker-syncd-brcm.mk +++ b/platform/broadcom/docker-syncd-brcm.mk @@ -3,6 +3,6 @@ DOCKER_SYNCD_BRCM = docker-syncd-brcm.gz $(DOCKER_SYNCD_BRCM)_PATH = $(PLATFORM_PATH)/docker-syncd-brcm $(DOCKER_SYNCD_BRCM)_DEPENDS += $(SYNCD) -$(DOCKER_SYNCD_BRCM)_FILES += $(BRCM_DSSERVE) $(BRCM_BCMCMD) +$(DOCKER_SYNCD_BRCM)_FILES += $(DSSERVE) $(BCMCMD) $(DOCKER_SYNCD_BRCM)_LOAD_DOCKERS += $(DOCKER_BASE) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM)