From 99c7c19c7a20f697d071014feabd768d60ee0e0e Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Thu, 20 Apr 2017 21:21:30 +0000 Subject: [PATCH 01/10] *** temp: build swss with mlnx sai 1.0 --- platform/mellanox/fw.mk | 2 +- platform/mellanox/mlnx-sai.mk | 4 ++-- platform/mellanox/mlnx-sai/Makefile | 2 +- platform/mellanox/sdk.mk | 16 ++++++++-------- rules/swss.mk | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk index 6f03c0fca221..964c4c30bc04 100644 --- a/platform/mellanox/fw.mk +++ b/platform/mellanox/fw.mk @@ -1,5 +1,5 @@ # mellanox firmware -MLNX_FW = fw-SPC.mfa +MLNX_FW = fw-SPC-rel-13_1300_0130-EVB.mfa $(MLNX_FW)_URL = $(MLNX_SDK_BASE_URL)/$(MLNX_FW) SONIC_ONLINE_FILES += $(MLNX_FW) diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk index 67bc173ae8a6..131748958049 100644 --- a/platform/mellanox/mlnx-sai.mk +++ b/platform/mellanox/mlnx-sai.mk @@ -1,7 +1,7 @@ # Mellanox SAI -MLNX_SAI_VERSION = 161120 -MLNX_SAI_REVISION = 579c19acf3b9bed181ac713fcf92302f4ebae422 +MLNX_SAI_VERSION = SAIRel1.8.1 +MLNX_SAI_REVISION = e7135c6b987337c987f1e77ff7d1f79a828211e9 export MLNX_SAI_VERSION MLNX_SAI_REVISION diff --git a/platform/mellanox/mlnx-sai/Makefile b/platform/mellanox/mlnx-sai/Makefile index 9a8005e5461f..187d6c252c13 100644 --- a/platform/mellanox/mlnx-sai/Makefile +++ b/platform/mellanox/mlnx-sai/Makefile @@ -7,7 +7,7 @@ MAIN_TARGET = mlnx-sai_1.mlnx.$(MLNX_SAI_VERSION)_amd64.deb $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # get sources rm -rf SAI-Implementation - git clone https://github.com/Mellanox/SAI-Implementation.git + git clone https://github.com/qiluo-msft/SAI-Implementation.git # build pushd SAI-Implementation diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index 71b3d218418b..8e8bedc4238a 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -1,5 +1,5 @@ -MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/35e5e8739bec80c19053b7bb9cf6d083b8144fb5/sdk -MLNX_SDK_VERSION = 4.2.3102 +MLNX_SDK_BASE_URL = https://github.com/andriymoroz-mlnx/SAI-Implementation/raw/53314a8f5c9f3e360fbb303f4deb39b4e48d9545/sdk +MLNX_SDK_VERSION = 4.2.4000 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2) $(SX_ACL_RM) $(SX_COMPLIB) \ $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \ $(SXD_LIBS) $(TESTX) @@ -20,8 +20,8 @@ $(eval $(call add_derived_package,$(IPROUTE2),$(IPROUTE2_DEV))) SX_COMPLIB = sx-complib_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb SX_COMPLIB_DEV = sx-complib-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV))) -SX_COMPLIB_DEV_STATIC = sx-complib-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb -$(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV_STATIC))) +# SX_COMPLIB_DEV_STATIC = sx-complib-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb +# $(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV_STATIC))) SX_EXAMPLES = sx-examples_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(SX_EXAMPLES)_DEPENDS += $(APPLIBS) $(SX_SCEW) $(SXD_LIBS) SX_EXAMPLES_DEV = sx-examples-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb @@ -33,13 +33,13 @@ $(eval $(call add_derived_package,$(SX_GEN_UTILS),$(SX_GEN_UTILS_DEV))) SX_SCEW = sx-scew_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb SX_SCEW_DEV = sx-scew-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV))) -SX_SCEW_DEV_STATIC = sx-scew-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb -$(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV_STATIC))) +# SX_SCEW_DEV_STATIC = sx-scew-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb +# $(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV_STATIC))) SXD_LIBS = sxd-libs_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb SXD_LIBS_DEV = sxd-libs-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV))) -SXD_LIBS_DEV_STATIC = sxd-libs-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb -$(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV_STATIC))) +# SXD_LIBS_DEV_STATIC = sxd-libs-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb +# $(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV_STATIC))) #packages that are required for runtime only PYTHON_SDK_API = python-sdk-api_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(PYTHON_SDK_API)_DEPENDS += $(APPLIBS) $(SXD_LIBS) diff --git a/rules/swss.mk b/rules/swss.mk index c3f50e617e92..e5b99bfc9a1e 100644 --- a/rules/swss.mk +++ b/rules/swss.mk @@ -2,9 +2,9 @@ SWSS = swss_1.0.0_amd64.deb $(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss -$(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \ +$(SWSS)_DEPENDS += $(MLNX_SAI) $(LIBTEAM_DEV) \ $(LIBTEAMDCT) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV) -$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON) +$(SWSS)_RDEPENDS += $(LIBTEAM) $(LIBSWSSCOMMON) $(MLNX_SAI) SONIC_DPKG_DEBS += $(SWSS) SWSS_DBG = swss-dbg_1.0.0_amd64.deb From 3bc30e16882d8c878882c51a96c541f5407e09bf Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Wed, 7 Jun 2017 23:46:39 +0000 Subject: [PATCH 02/10] Update MLNX SDK url --- platform/mellanox/sdk.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index 8e8bedc4238a..a4bda81e59a5 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -1,4 +1,5 @@ -MLNX_SDK_BASE_URL = https://github.com/andriymoroz-mlnx/SAI-Implementation/raw/53314a8f5c9f3e360fbb303f4deb39b4e48d9545/sdk +MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/f3a5883f93d7ef6ad8aa002e4e5abaa22fb7adfd/sdk + MLNX_SDK_VERSION = 4.2.4000 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2) $(SX_ACL_RM) $(SX_COMPLIB) \ $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \ From d516850b204d765855bf0452267a0eb02cc9655c Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Thu, 8 Jun 2017 21:38:22 +0000 Subject: [PATCH 03/10] Update submodules: sonic-sairedis, sonic-swss for SAI 1.0 --- 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 f02e667d03f7..70eb856e8195 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit f02e667d03f7840132c9dd210254cff2b2e0ad1d +Subproject commit 70eb856e81954f2b453dd638a79d098913dcf6e9 diff --git a/src/sonic-swss b/src/sonic-swss index b893b4f70b79..1511fb8733c9 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit b893b4f70b79f5a87674e3a67a64accff0dd9437 +Subproject commit 1511fb8733c9b69b048b3ffd7456311d0ac34869 From 5c1453163da0baba5280f76ba45816eed027af05 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Fri, 9 Jun 2017 00:17:35 +0000 Subject: [PATCH 04/10] Fix swss dependencies --- rules/swss.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/swss.mk b/rules/swss.mk index e5b99bfc9a1e..c3f50e617e92 100644 --- a/rules/swss.mk +++ b/rules/swss.mk @@ -2,9 +2,9 @@ SWSS = swss_1.0.0_amd64.deb $(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss -$(SWSS)_DEPENDS += $(MLNX_SAI) $(LIBTEAM_DEV) \ +$(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \ $(LIBTEAMDCT) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV) -$(SWSS)_RDEPENDS += $(LIBTEAM) $(LIBSWSSCOMMON) $(MLNX_SAI) +$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON) SONIC_DPKG_DEBS += $(SWSS) SWSS_DBG = swss-dbg_1.0.0_amd64.deb From c960ab1b3ddc76ddbf9908fd631b1a191d22d76b Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Thu, 8 Jun 2017 21:47:32 +0000 Subject: [PATCH 05/10] Modify MLNX repos --- platform/mellanox/mlnx-sai.mk | 2 +- platform/mellanox/mlnx-sai/Makefile | 2 +- platform/mellanox/sdk.mk | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk index 131748958049..a7d4f7334ee6 100644 --- a/platform/mellanox/mlnx-sai.mk +++ b/platform/mellanox/mlnx-sai.mk @@ -1,7 +1,7 @@ # Mellanox SAI MLNX_SAI_VERSION = SAIRel1.8.1 -MLNX_SAI_REVISION = e7135c6b987337c987f1e77ff7d1f79a828211e9 +MLNX_SAI_REVISION = b3e60a3e3eee45a783579616e98e378815ee5591 export MLNX_SAI_VERSION MLNX_SAI_REVISION diff --git a/platform/mellanox/mlnx-sai/Makefile b/platform/mellanox/mlnx-sai/Makefile index 187d6c252c13..9a8005e5461f 100644 --- a/platform/mellanox/mlnx-sai/Makefile +++ b/platform/mellanox/mlnx-sai/Makefile @@ -7,7 +7,7 @@ MAIN_TARGET = mlnx-sai_1.mlnx.$(MLNX_SAI_VERSION)_amd64.deb $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% : # get sources rm -rf SAI-Implementation - git clone https://github.com/qiluo-msft/SAI-Implementation.git + git clone https://github.com/Mellanox/SAI-Implementation.git # build pushd SAI-Implementation diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index a4bda81e59a5..08deb4517597 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -1,5 +1,4 @@ MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/f3a5883f93d7ef6ad8aa002e4e5abaa22fb7adfd/sdk - MLNX_SDK_VERSION = 4.2.4000 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2) $(SX_ACL_RM) $(SX_COMPLIB) \ $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \ @@ -21,8 +20,6 @@ $(eval $(call add_derived_package,$(IPROUTE2),$(IPROUTE2_DEV))) SX_COMPLIB = sx-complib_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb SX_COMPLIB_DEV = sx-complib-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV))) -# SX_COMPLIB_DEV_STATIC = sx-complib-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb -# $(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV_STATIC))) SX_EXAMPLES = sx-examples_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(SX_EXAMPLES)_DEPENDS += $(APPLIBS) $(SX_SCEW) $(SXD_LIBS) SX_EXAMPLES_DEV = sx-examples-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb @@ -34,13 +31,9 @@ $(eval $(call add_derived_package,$(SX_GEN_UTILS),$(SX_GEN_UTILS_DEV))) SX_SCEW = sx-scew_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb SX_SCEW_DEV = sx-scew-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV))) -# SX_SCEW_DEV_STATIC = sx-scew-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb -# $(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV_STATIC))) SXD_LIBS = sxd-libs_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb SXD_LIBS_DEV = sxd-libs-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV))) -# SXD_LIBS_DEV_STATIC = sxd-libs-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb -# $(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV_STATIC))) #packages that are required for runtime only PYTHON_SDK_API = python-sdk-api_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(PYTHON_SDK_API)_DEPENDS += $(APPLIBS) $(SXD_LIBS) From e5ef53f513f120c1caea1bc5834f23abf67c8ddf Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Fri, 9 Jun 2017 15:49:43 +0000 Subject: [PATCH 06/10] *** temp: disable LIBSAITHRIFT_DEV_MLNX --- platform/mellanox/libsaithrift-dev.mk | 2 +- platform/mellanox/rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/mellanox/libsaithrift-dev.mk b/platform/mellanox/libsaithrift-dev.mk index 0fc6d3f4eb84..39222be39cab 100644 --- a/platform/mellanox/libsaithrift-dev.mk +++ b/platform/mellanox/libsaithrift-dev.mk @@ -4,4 +4,4 @@ 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) +#SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MLNX) diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk index 6b88748c73a2..a6085a7ae0f5 100644 --- a/platform/mellanox/rules.mk +++ b/platform/mellanox/rules.mk @@ -17,7 +17,7 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \ $(DOCKER_SYNCD_MLNX_RPC) # Inject mlnx sai into sairedis -$(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI) $(LIBSAITHRIFT_DEV_MLNX) +$(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI) #$(LIBSAITHRIFT_DEV_MLNX) # Runtime dependency on mlnx sai is set only for syncd $(SYNCD)_RDEPENDS += $(MLNX_SAI) From db4948395da923d16586d6e0c11aa78026a9ff08 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Fri, 9 Jun 2017 20:40:03 +0000 Subject: [PATCH 07/10] Fix mlnx-sai version string --- platform/mellanox/mlnx-sai.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk index a7d4f7334ee6..3dbf1e8f293e 100644 --- a/platform/mellanox/mlnx-sai.mk +++ b/platform/mellanox/mlnx-sai.mk @@ -1,6 +1,6 @@ # Mellanox SAI -MLNX_SAI_VERSION = SAIRel1.8.1 +MLNX_SAI_VERSION = SAIRel1.8.1-master MLNX_SAI_REVISION = b3e60a3e3eee45a783579616e98e378815ee5591 export MLNX_SAI_VERSION MLNX_SAI_REVISION From 8b58eb399fc4d8a998550534ab95cd188e8e99a9 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Sat, 10 Jun 2017 02:17:57 +0000 Subject: [PATCH 08/10] Fix mfa filename for MLNX --- platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 index 0736df044162..4f8dd621e93d 100755 --- a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 +++ b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 @@ -20,7 +20,7 @@ debs/{{ deb }}{{' '}} COPY ["start.sh", "mlnx-fw-upgrade.sh", "/usr/bin/"] COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] -COPY ["/debs/fw-SPC.mfa", "/etc/mlnx/"] +COPY ["/debs/fw-SPC-rel-13_1300_0130-EVB.mfa", "/etc/mlnx/"] ## Clean up RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y From f4b12acf54f564c9b08c33b0d1f553abfede8949 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Sun, 11 Jun 2017 04:49:44 +0000 Subject: [PATCH 09/10] Update submodules: sonic-sairedis, sonic-swss --- 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 70eb856e8195..d71c50554003 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 70eb856e81954f2b453dd638a79d098913dcf6e9 +Subproject commit d71c505540039c218218d728888075b131720234 diff --git a/src/sonic-swss b/src/sonic-swss index 1511fb8733c9..0f004d34cd1f 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 1511fb8733c9b69b048b3ffd7456311d0ac34869 +Subproject commit 0f004d34cd1f8f1b05bd268289cb84e2d56d8dd2 From 50184277229b59c1438ccdba333c5cd186089b50 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Tue, 13 Jun 2017 05:15:28 +0000 Subject: [PATCH 10/10] *** temp: Don't build DOCKER_PTF_MLNX, PYTHON_SAITHRIFT_MLNX --- platform/mellanox/docker-ptf-mlnx.mk | 2 +- platform/mellanox/python-saithrift.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/mellanox/docker-ptf-mlnx.mk b/platform/mellanox/docker-ptf-mlnx.mk index 7f23dc715e32..9f994f62de64 100644 --- a/platform/mellanox/docker-ptf-mlnx.mk +++ b/platform/mellanox/docker-ptf-mlnx.mk @@ -4,4 +4,4 @@ DOCKER_PTF_MLNX = docker-ptf-mlnx.gz $(DOCKER_PTF_MLNX)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift $(DOCKER_PTF_MLNX)_DEPENDS += $(PYTHON_SAITHRIFT_MLNX) $(DOCKER_PTF_MLNX)_LOAD_DOCKERS += $(DOCKER_PTF) -SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MLNX) +#SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MLNX) diff --git a/platform/mellanox/python-saithrift.mk b/platform/mellanox/python-saithrift.mk index cbe5af29b3e2..59685121e02c 100644 --- a/platform/mellanox/python-saithrift.mk +++ b/platform/mellanox/python-saithrift.mk @@ -3,4 +3,4 @@ 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) $(MLNX_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV) -SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MLNX) +#SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MLNX)