From 295d13d1f29e2ab5984e67cf93ceb8347d9d6f14 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 10:42:31 -0700 Subject: [PATCH 01/10] add saithrift library for brcm platform --- platform/broadcom/libsaithrift-dev.mk | 7 +++++++ platform/broadcom/python-saithrift.mk | 5 +++++ platform/broadcom/rules.mk | 2 ++ 3 files changed, 14 insertions(+) create mode 100644 platform/broadcom/libsaithrift-dev.mk create mode 100644 platform/broadcom/python-saithrift.mk diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk new file mode 100644 index 000000000000..6c8a17238b03 --- /dev/null +++ b/platform/broadcom/libsaithrift-dev.mk @@ -0,0 +1,7 @@ +# libsaithrift-dev package + +LIBSAITHRIFT_DEV_BRCM = libsaithrift-dev_0.9.4_amd64.deb +$(LIBSAITHRIFT_DEV_BRCM)_SRC_PATH = $(SRC_PATH)/SAI +$(LIBSAITHRIFT_DEV_BRCM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV) $(BRCM_OPENNSL) +$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI) +SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BRCM) diff --git a/platform/broadcom/python-saithrift.mk b/platform/broadcom/python-saithrift.mk new file mode 100644 index 000000000000..00f1f1f1d815 --- /dev/null +++ b/platform/broadcom/python-saithrift.mk @@ -0,0 +1,5 @@ +# python-saithrift package + +PYTHON_SAITHRIFT_BRCM = python-saithrift_0.9.4_amd64.deb +$(PYTHON_SAITHRIFT_BRCM)_SRC_PATH = $(SRC_PATH)/SAI +SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_BRCM) diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk index 37e18ba80285..c7f24003492e 100755 --- a/platform/broadcom/rules.mk +++ b/platform/broadcom/rules.mk @@ -8,6 +8,8 @@ include $(PLATFORM_PATH)/docker-orchagent-brcm.mk include $(PLATFORM_PATH)/docker-syncd-brcm.mk include $(PLATFORM_PATH)/one-image.mk include $(PLATFORM_PATH)/one-aboot.mk +include $(PLATFORM_PATH)/libsaithrift-dev.mk +include $(PLATFORM_PATH)/python-saithrift.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" From efd486db708ed75471c5ce21fb243b46dc219379 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 10:42:48 -0700 Subject: [PATCH 02/10] Remove trailing space --- platform/broadcom/libsaithrift-dev.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk index 6c8a17238b03..9e1d3af79c42 100644 --- a/platform/broadcom/libsaithrift-dev.mk +++ b/platform/broadcom/libsaithrift-dev.mk @@ -3,5 +3,5 @@ LIBSAITHRIFT_DEV_BRCM = libsaithrift-dev_0.9.4_amd64.deb $(LIBSAITHRIFT_DEV_BRCM)_SRC_PATH = $(SRC_PATH)/SAI $(LIBSAITHRIFT_DEV_BRCM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV) $(BRCM_OPENNSL) -$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI) +$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BRCM) From 152fb1c83866e869ed6e06e5c3915142ca007574 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 10:45:44 -0700 Subject: [PATCH 03/10] Add SAI submodule --- .gitmodules | 4 ++++ src/SAI | 1 + 2 files changed, 5 insertions(+) create mode 160000 src/SAI diff --git a/.gitmodules b/.gitmodules index c8fb78edcdff..190bc7ff9a82 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,3 +56,7 @@ [submodule "platform/broadcom/sonic-platform-modules-ingrasys-s9100"] path = platform/broadcom/sonic-platform-modules-ingrasys-s9100 url = https://github.com/Ingrasys-sonic/sonic-platform-ingrasys-s9100 +[submodule "src/SAI"] + path = src/SAI + url = https://github.com/opencomputeproject/SAI + branch = v0.9.4 diff --git a/src/SAI b/src/SAI new file mode 160000 index 000000000000..d311ef8e0ba3 --- /dev/null +++ b/src/SAI @@ -0,0 +1 @@ +Subproject commit d311ef8e0ba3505df10085db3f6fb39e05a92884 From a142ed1a81cc379676fdf174b8e9f665e0e8d175 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 17:55:45 +0000 Subject: [PATCH 04/10] Fix issues with brcm saithrift --- .gitmodules | 3 ++- platform/broadcom/libsaithrift-dev.mk | 2 +- platform/broadcom/python-saithrift.mk | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 190bc7ff9a82..131b4634b514 100644 --- a/.gitmodules +++ b/.gitmodules @@ -59,4 +59,5 @@ [submodule "src/SAI"] path = src/SAI url = https://github.com/opencomputeproject/SAI - branch = v0.9.4 + branch = v0.9.4 + diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk index 9e1d3af79c42..599d0fcf6f0d 100644 --- a/platform/broadcom/libsaithrift-dev.mk +++ b/platform/broadcom/libsaithrift-dev.mk @@ -3,5 +3,5 @@ LIBSAITHRIFT_DEV_BRCM = libsaithrift-dev_0.9.4_amd64.deb $(LIBSAITHRIFT_DEV_BRCM)_SRC_PATH = $(SRC_PATH)/SAI $(LIBSAITHRIFT_DEV_BRCM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV) $(BRCM_OPENNSL) -$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI) +$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI) $(BRCM_OPENNSL) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BRCM) diff --git a/platform/broadcom/python-saithrift.mk b/platform/broadcom/python-saithrift.mk index 00f1f1f1d815..f9da4143c7d9 100644 --- a/platform/broadcom/python-saithrift.mk +++ b/platform/broadcom/python-saithrift.mk @@ -2,4 +2,5 @@ PYTHON_SAITHRIFT_BRCM = python-saithrift_0.9.4_amd64.deb $(PYTHON_SAITHRIFT_BRCM)_SRC_PATH = $(SRC_PATH)/SAI +$(PYTHON_SAITHRIFT_BRCM)_DEPENDS += $(BRCM_SAI_DEV) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_BRCM) From 52584a0319c4cf57d9486910e5d3c55212cacb59 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 12:20:12 -0700 Subject: [PATCH 05/10] Add MLNX --- platform/mellanox/libsaithrift-dev.mk | 7 +++++++ platform/mellanox/python-saithrift.mk | 6 ++++++ platform/mellanox/rules.mk | 2 ++ 3 files changed, 15 insertions(+) create mode 100644 platform/mellanox/libsaithrift-dev.mk create mode 100644 platform/mellanox/python-saithrift.mk diff --git a/platform/mellanox/libsaithrift-dev.mk b/platform/mellanox/libsaithrift-dev.mk new file mode 100644 index 000000000000..0fc6d3f4eb84 --- /dev/null +++ b/platform/mellanox/libsaithrift-dev.mk @@ -0,0 +1,7 @@ +# libsaithrift-dev package + +LIBSAITHRIFT_DEV_MLNX = libsaithrift-dev_0.9.4_amd64.deb +$(LIBSAITHRIFT_DEV_MLNX)_SRC_PATH = $(SRC_PATH)/SAI +$(LIBSAITHRIFT_DEV_MLNX)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(MLNX_SAI) $(MLNX_SAI_DEV) +$(LIBSAITHRIFT_DEV_MLNX)_RDEPENDS += $(LIBTHRIFT) $(MLNX_SAI) +SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MLNX) diff --git a/platform/mellanox/python-saithrift.mk b/platform/mellanox/python-saithrift.mk new file mode 100644 index 000000000000..ba18e6c24841 --- /dev/null +++ b/platform/mellanox/python-saithrift.mk @@ -0,0 +1,6 @@ +# python-saithrift package + +PYTHON_SAITHRIFT_MLNX = python-saithrift_0.9.4_amd64.deb +$(PYTHON_SAITHRIFT_MLNX)_SRC_PATH = $(SRC_PATH)/SAI +$(PYTHON_SAITHRIFT_MLNX)_DEPENDS += $(MLNX_SAI_DEV) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) +SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MLNX) diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk index 8bcb8d0278b4..2650636f033b 100644 --- a/platform/mellanox/rules.mk +++ b/platform/mellanox/rules.mk @@ -6,6 +6,8 @@ include $(PLATFORM_PATH)/hw-management.mk include $(PLATFORM_PATH)/docker-syncd-mlnx.mk include $(PLATFORM_PATH)/docker-orchagent-mlnx.mk include $(PLATFORM_PATH)/one-image.mk +include $(PLATFORM_PATH)/libsaithrift-dev.mk +include $(PLATFORM_PATH)/python-saithrift.mk SONIC_ALL += $(SONIC_ONE_IMAGE) \ $(DOCKER_FPM_GOBGP) From bf6be72fb3a7da77d3ea5ed8334af65ded007d4c Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 12:21:56 -0700 Subject: [PATCH 06/10] Add mlnx sdk debs --- platform/mellanox/libsaithrift-dev.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/mellanox/libsaithrift-dev.mk b/platform/mellanox/libsaithrift-dev.mk index 0fc6d3f4eb84..04623b88e7d5 100644 --- a/platform/mellanox/libsaithrift-dev.mk +++ b/platform/mellanox/libsaithrift-dev.mk @@ -2,6 +2,6 @@ LIBSAITHRIFT_DEV_MLNX = libsaithrift-dev_0.9.4_amd64.deb $(LIBSAITHRIFT_DEV_MLNX)_SRC_PATH = $(SRC_PATH)/SAI -$(LIBSAITHRIFT_DEV_MLNX)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(MLNX_SAI) $(MLNX_SAI_DEV) -$(LIBSAITHRIFT_DEV_MLNX)_RDEPENDS += $(LIBTHRIFT) $(MLNX_SAI) +$(LIBSAITHRIFT_DEV_MLNX)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(MLNX_SAI) $(MLNX_SAI_DEV) $(MLNX_SDK_RDEBS) $(MLNX_SDK_DEBS) +$(LIBSAITHRIFT_DEV_MLNX)_RDEPENDS += $(LIBTHRIFT) $(MLNX_SAI) $(MLNX_SDK_RDEBS) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MLNX) From 3d736eae8605ec9ab5b24513bc3405edc8bafe08 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 20:30:29 +0000 Subject: [PATCH 07/10] Remove unnecessary dependencies --- platform/broadcom/libsaithrift-dev.mk | 4 ++-- platform/mellanox/libsaithrift-dev.mk | 4 ++-- platform/mellanox/python-saithrift.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk index 599d0fcf6f0d..c809539b47fe 100644 --- a/platform/broadcom/libsaithrift-dev.mk +++ b/platform/broadcom/libsaithrift-dev.mk @@ -2,6 +2,6 @@ LIBSAITHRIFT_DEV_BRCM = libsaithrift-dev_0.9.4_amd64.deb $(LIBSAITHRIFT_DEV_BRCM)_SRC_PATH = $(SRC_PATH)/SAI -$(LIBSAITHRIFT_DEV_BRCM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV) $(BRCM_OPENNSL) -$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI) $(BRCM_OPENNSL) +$(LIBSAITHRIFT_DEV_BRCM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BRCM_SAI) $(BRCM_SAI_DEV) +$(LIBSAITHRIFT_DEV_BRCM)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BRCM) diff --git a/platform/mellanox/libsaithrift-dev.mk b/platform/mellanox/libsaithrift-dev.mk index 04623b88e7d5..0fc6d3f4eb84 100644 --- a/platform/mellanox/libsaithrift-dev.mk +++ b/platform/mellanox/libsaithrift-dev.mk @@ -2,6 +2,6 @@ LIBSAITHRIFT_DEV_MLNX = libsaithrift-dev_0.9.4_amd64.deb $(LIBSAITHRIFT_DEV_MLNX)_SRC_PATH = $(SRC_PATH)/SAI -$(LIBSAITHRIFT_DEV_MLNX)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(MLNX_SAI) $(MLNX_SAI_DEV) $(MLNX_SDK_RDEBS) $(MLNX_SDK_DEBS) -$(LIBSAITHRIFT_DEV_MLNX)_RDEPENDS += $(LIBTHRIFT) $(MLNX_SAI) $(MLNX_SDK_RDEBS) +$(LIBSAITHRIFT_DEV_MLNX)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(MLNX_SAI) $(MLNX_SAI_DEV) +$(LIBSAITHRIFT_DEV_MLNX)_RDEPENDS += $(LIBTHRIFT) $(MLNX_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MLNX) diff --git a/platform/mellanox/python-saithrift.mk b/platform/mellanox/python-saithrift.mk index ba18e6c24841..cbe5af29b3e2 100644 --- a/platform/mellanox/python-saithrift.mk +++ b/platform/mellanox/python-saithrift.mk @@ -2,5 +2,5 @@ PYTHON_SAITHRIFT_MLNX = python-saithrift_0.9.4_amd64.deb $(PYTHON_SAITHRIFT_MLNX)_SRC_PATH = $(SRC_PATH)/SAI -$(PYTHON_SAITHRIFT_MLNX)_DEPENDS += $(MLNX_SAI_DEV) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) +$(PYTHON_SAITHRIFT_MLNX)_DEPENDS += $(MLNX_SAI_DEV) $(MLNX_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MLNX) From 89b4ca6786c4bad7f3bd18307f759ab26bc9a9d0 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 13:34:59 -0700 Subject: [PATCH 08/10] Update SAI to latest commit on v0.9.4 branch --- src/SAI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SAI b/src/SAI index d311ef8e0ba3..20f7dffba5dc 160000 --- a/src/SAI +++ b/src/SAI @@ -1 +1 @@ -Subproject commit d311ef8e0ba3505df10085db3f6fb39e05a92884 +Subproject commit 20f7dffba5dcb0922a4af6e945804b821a3772c1 From b29ed962aaa853ca6ecd9963e792051b206cb4bc Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 14:28:52 -0700 Subject: [PATCH 09/10] Add libsaithrift support for cavium and centec --- platform/cavium/libsaithrift-dev.mk | 7 +++++++ platform/cavium/python-saithrift.mk | 6 ++++++ platform/cavium/rules.mk | 2 ++ platform/centec/libsaithrift-dev.mk | 7 +++++++ platform/centec/python-saithrift.mk | 6 ++++++ platform/centec/rules.mk | 2 ++ 6 files changed, 30 insertions(+) create mode 100644 platform/cavium/libsaithrift-dev.mk create mode 100644 platform/cavium/python-saithrift.mk create mode 100644 platform/centec/libsaithrift-dev.mk create mode 100644 platform/centec/python-saithrift.mk diff --git a/platform/cavium/libsaithrift-dev.mk b/platform/cavium/libsaithrift-dev.mk new file mode 100644 index 000000000000..008456b5419d --- /dev/null +++ b/platform/cavium/libsaithrift-dev.mk @@ -0,0 +1,7 @@ +# libsaithrift-dev package + +LIBSAITHRIFT_DEV_CAVM = libsaithrift-dev_0.9.4_amd64.deb +$(LIBSAITHRIFT_DEV_CAVM)_SRC_PATH = $(SRC_PATH)/SAI +$(LIBSAITHRIFT_DEV_CAVM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(CAVM_LIBSAI) +$(LIBSAITHRIFT_DEV_CAVM)_RDEPENDS += $(LIBTHRIFT) $(CAVM_LIBSAI) +SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_CAVM) diff --git a/platform/cavium/python-saithrift.mk b/platform/cavium/python-saithrift.mk new file mode 100644 index 000000000000..0000d0ba8b39 --- /dev/null +++ b/platform/cavium/python-saithrift.mk @@ -0,0 +1,6 @@ +# python-saithrift package + +PYTHON_SAITHRIFT_CAVM = python-saithrift_0.9.4_amd64.deb +$(PYTHON_SAITHRIFT_CAVM)_SRC_PATH = $(SRC_PATH)/SAI +$(PYTHON_SAITHRIFT_CAVM)_DEPENDS += $(CAVM_LIBSAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) +SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_CAVM) diff --git a/platform/cavium/rules.mk b/platform/cavium/rules.mk index 05312066719f..f72989c241b8 100644 --- a/platform/cavium/rules.mk +++ b/platform/cavium/rules.mk @@ -3,6 +3,8 @@ include $(PLATFORM_PATH)/docker-syncd-cavm.mk include $(PLATFORM_PATH)/docker-orchagent-cavm.mk include $(PLATFORM_PATH)/cavm_platform_modules.mk include $(PLATFORM_PATH)/one-image.mk +include $(PLATFORM_PATH)/libsaithrift-dev.mk +include $(PLATFORM_PATH)/python-saithrift.mk SONIC_ALL += $(SONIC_ONE_IMAGE) \ $(DOCKER_FPM_GOBGP) diff --git a/platform/centec/libsaithrift-dev.mk b/platform/centec/libsaithrift-dev.mk new file mode 100644 index 000000000000..b8fddbdf7731 --- /dev/null +++ b/platform/centec/libsaithrift-dev.mk @@ -0,0 +1,7 @@ +# libsaithrift-dev package + +LIBSAITHRIFT_DEV_CENTEC = libsaithrift-dev_0.9.4_amd64.deb +$(LIBSAITHRIFT_DEV_CENTEC)_SRC_PATH = $(SRC_PATH)/SAI +$(LIBSAITHRIFT_DEV_CENTEC)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(CENTEC_SAI) +$(LIBSAITHRIFT_DEV_CENTEC)_RDEPENDS += $(LIBTHRIFT) $(CENTEC_SAI) +SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_CENTEC) diff --git a/platform/centec/python-saithrift.mk b/platform/centec/python-saithrift.mk new file mode 100644 index 000000000000..37d1e935c041 --- /dev/null +++ b/platform/centec/python-saithrift.mk @@ -0,0 +1,6 @@ +# python-saithrift package + +PYTHON_SAITHRIFT_CENTEC = python-saithrift_0.9.4_amd64.deb +$(PYTHON_SAITHRIFT_CENTEC)_SRC_PATH = $(SRC_PATH)/SAI +$(PYTHON_SAITHRIFT_CENTEC)_DEPENDS += $(CENTEC_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) +SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_CENTEC) diff --git a/platform/centec/rules.mk b/platform/centec/rules.mk index d8c3568f0cc0..9e53996c0a36 100644 --- a/platform/centec/rules.mk +++ b/platform/centec/rules.mk @@ -3,6 +3,8 @@ include $(PLATFORM_PATH)/sai.mk include $(PLATFORM_PATH)/docker-orchagent-centec.mk include $(PLATFORM_PATH)/docker-syncd-centec.mk include $(PLATFORM_PATH)/one-image.mk +include $(PLATFORM_PATH)/libsaithrift-dev.mk +include $(PLATFORM_PATH)/python-saithrift.mk SONIC_ALL += $(SONIC_ONE_IMAGE) From 8277bf7821fdf89e43425cd693e4f3614fe53461 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Mon, 27 Mar 2017 22:39:45 +0000 Subject: [PATCH 10/10] Fix issues with Cavium build --- platform/cavium/libsaithrift-dev.mk | 4 ++-- platform/cavium/python-saithrift.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/cavium/libsaithrift-dev.mk b/platform/cavium/libsaithrift-dev.mk index 008456b5419d..4a19fabffaf2 100644 --- a/platform/cavium/libsaithrift-dev.mk +++ b/platform/cavium/libsaithrift-dev.mk @@ -2,6 +2,6 @@ LIBSAITHRIFT_DEV_CAVM = libsaithrift-dev_0.9.4_amd64.deb $(LIBSAITHRIFT_DEV_CAVM)_SRC_PATH = $(SRC_PATH)/SAI -$(LIBSAITHRIFT_DEV_CAVM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(CAVM_LIBSAI) -$(LIBSAITHRIFT_DEV_CAVM)_RDEPENDS += $(LIBTHRIFT) $(CAVM_LIBSAI) +$(LIBSAITHRIFT_DEV_CAVM)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(CAVM_LIBSAI) $(CAVM_SAI) +$(LIBSAITHRIFT_DEV_CAVM)_RDEPENDS += $(LIBTHRIFT) $(CAVM_SAI) SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_CAVM) diff --git a/platform/cavium/python-saithrift.mk b/platform/cavium/python-saithrift.mk index 0000d0ba8b39..91d00ebaebc0 100644 --- a/platform/cavium/python-saithrift.mk +++ b/platform/cavium/python-saithrift.mk @@ -2,5 +2,5 @@ PYTHON_SAITHRIFT_CAVM = python-saithrift_0.9.4_amd64.deb $(PYTHON_SAITHRIFT_CAVM)_SRC_PATH = $(SRC_PATH)/SAI -$(PYTHON_SAITHRIFT_CAVM)_DEPENDS += $(CAVM_LIBSAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) +$(PYTHON_SAITHRIFT_CAVM)_DEPENDS += $(CAVM_LIBSAI) $(CAVM_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_CAVM)