From a1cc2accd9712b1b4173fd686115dff2fae7f1c8 Mon Sep 17 00:00:00 2001 From: Prince Date: Tue, 26 Jun 2018 03:58:51 +0000 Subject: [PATCH 1/4] Update submodule pointers --- src/sonic-sairedis | 2 +- src/sonic-swss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index 5fee797a1d2a..f0eaed0b0653 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 5fee797a1d2ae4d4ba7d7c7ea8cc79578f5c19f5 +Subproject commit f0eaed0b065334db66e1dfe04b20c6fca159601f diff --git a/src/sonic-swss b/src/sonic-swss index 22bb2cdf461d..19f910864157 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 22bb2cdf461d7456293219fada0998acad2bfe74 +Subproject commit 19f9108641571ee38903bb4ad9fb6969a7f0437e From 633deb2cf24319c0b5675ba3190e8ba37d1cdeb6 Mon Sep 17 00:00:00 2001 From: Prince Date: Fri, 8 Jun 2018 20:20:00 +0000 Subject: [PATCH 2/4] Update Broadcom SAI version --- platform/broadcom/sai.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 5cda170b3391..0846f113750f 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,9 +1,9 @@ -BRCM_SAI = libsaibcm_3.1.3.4-15_amd64.deb -$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_3.1.3.4-15_amd64.deb?sv=2015-04-05&sr=b&sig=7CIkdlBB%2BY6Xjae0vc1QBnlAVedRkreJRhWM93SyHOI%3D&se=2032-02-29T18%3A31%3A54Z&sp=r" +BRCM_SAI = libsaibcm_3.1.3.5_amd64.deb +$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_3.1.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=18QHUjQJcZ3dH2VZS3%2B2FWgT8WpsZp9sqaEajs2nzTw%3D&se=2032-02-15T20%3A06%3A26Z&sp=r" -BRCM_SAI_DEV = libsaibcm-dev_3.1.3.4-15_amd64.deb +BRCM_SAI_DEV = libsaibcm-dev_3.1.3.5_amd64.deb $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) -$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_3.1.3.4-15_amd64.deb?sv=2015-04-05&sr=b&sig=rBOT802o1o%2BAcogaXq%2FgqyuTAmSlFKhtPzYM%2BtXlIdM%3D&se=2032-02-29T18%3A34%3A10Z&sp=r" +$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_3.1.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=FisYV5Rcluycfnpo791NQBoouEWxzpPZVyZDjLsIFLQ%3D&se=2032-02-15T20%3A09%3A15Z&sp=r" SONIC_ONLINE_DEBS += $(BRCM_SAI) $(BRCM_SAI_DEV) $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI) From 322d19e78c91e7e363aa64eb15bd45992e77e0f4 Mon Sep 17 00:00:00 2001 From: Prince Date: Thu, 7 Jun 2018 19:24:54 +0000 Subject: [PATCH 3/4] SAI 1.3 changes --- platform/broadcom/libsaithrift-dev.mk | 2 +- platform/broadcom/python-saithrift.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk index d5b2c8d35dd0..1c38f0edc7d3 100644 --- a/platform/broadcom/libsaithrift-dev.mk +++ b/platform/broadcom/libsaithrift-dev.mk @@ -1,6 +1,6 @@ # libsaithrift-dev package -LIBSAITHRIFT_DEV_BRCM = libsaithrift-dev_1.2.1_amd64.deb +LIBSAITHRIFT_DEV_BRCM = libsaithrift-dev_1.3.0_amd64.deb $(LIBSAITHRIFT_DEV_BRCM)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI $(LIBSAITHRIFT_DEV_BRCM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV) $(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI) diff --git a/platform/broadcom/python-saithrift.mk b/platform/broadcom/python-saithrift.mk index 5f9b88eafea4..53456e06ddb6 100644 --- a/platform/broadcom/python-saithrift.mk +++ b/platform/broadcom/python-saithrift.mk @@ -1,6 +1,6 @@ # python-saithrift package -PYTHON_SAITHRIFT_BRCM = python-saithrift_1.2.1_amd64.deb +PYTHON_SAITHRIFT_BRCM = python-saithrift_1.3.0_amd64.deb $(PYTHON_SAITHRIFT_BRCM)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI $(PYTHON_SAITHRIFT_BRCM)_DEPENDS += $(BRCM_SAI_DEV) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_BRCM) From 464c036f3e13f985b42ee6385e583cd793bfb46f Mon Sep 17 00:00:00 2001 From: Prince Date: Thu, 5 Jul 2018 22:24:43 +0000 Subject: [PATCH 4/4] Sync to latest --- platform/broadcom/sai.mk | 4 ++-- src/sonic-sairedis | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 0846f113750f..cd2f570f20e6 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,9 +1,9 @@ BRCM_SAI = libsaibcm_3.1.3.5_amd64.deb -$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_3.1.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=18QHUjQJcZ3dH2VZS3%2B2FWgT8WpsZp9sqaEajs2nzTw%3D&se=2032-02-15T20%3A06%3A26Z&sp=r" +$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_3.1.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=ui%2FF8c4fZOCqWp6KkYLvsJrJtfuWVmBCQkQWJgcyD%2FE%3D&se=2032-03-13T22%3A02%3A37Z&sp=r" BRCM_SAI_DEV = libsaibcm-dev_3.1.3.5_amd64.deb $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) -$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_3.1.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=FisYV5Rcluycfnpo791NQBoouEWxzpPZVyZDjLsIFLQ%3D&se=2032-02-15T20%3A09%3A15Z&sp=r" +$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_3.1.3.5_amd64.deb?sv=2015-04-05&sr=b&sig=Yk%2Bg8x84m8MBFJKSVmoPAkPFR6BCqmTrGlLY89JXGe8%3D&se=2032-03-13T22%3A03%3A27Z&sp=r" SONIC_ONLINE_DEBS += $(BRCM_SAI) $(BRCM_SAI_DEV) $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index f0eaed0b0653..8585fc84d422 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit f0eaed0b065334db66e1dfe04b20c6fca159601f +Subproject commit 8585fc84d422abf74d472702de7ad5ab20aa55e5