From ad2ac6c20526642ac4df75ba1847db378a0474e4 Mon Sep 17 00:00:00 2001 From: Marian Pritsak Date: Thu, 8 Dec 2016 16:45:58 +0200 Subject: [PATCH 1/3] Add python api to mlnx SDK --- 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 b8a8e1bbc0ba..f311229ebea6 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -2,7 +2,7 @@ MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/sonic/sdk MLNX_SDK_VERSION = 4.2.3002 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2) $(SX_ACL_RM) $(SX_COMPLIB) \ $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \ - $(SXD_LIBS) $(TESTX) + $(SXD_LIBS) $(TESTX) $(PYTHON_SDK_API) MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_DEV) $(SX_ACL_RM_DEV) \ $(SX_COMPLIB_DEV) $(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) \ @@ -37,6 +37,7 @@ 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))) +PYTHON_SDK_API = python-sdk-api_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb define make_url $(1)_URL = $(MLNX_SDK_BASE_URL)/$(1) From 60649c6d312767efcc8de1078793fcdbd8aef21f Mon Sep 17 00:00:00 2001 From: Marian Pritsak Date: Thu, 8 Dec 2016 19:10:02 +0200 Subject: [PATCH 2/3] Update sdk.mk --- platform/mellanox/sdk.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index f311229ebea6..06b71f6847be 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -2,7 +2,7 @@ MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/sonic/sdk MLNX_SDK_VERSION = 4.2.3002 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2) $(SX_ACL_RM) $(SX_COMPLIB) \ $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \ - $(SXD_LIBS) $(TESTX) $(PYTHON_SDK_API) + $(SXD_LIBS) $(TESTX) MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_DEV) $(SX_ACL_RM_DEV) \ $(SX_COMPLIB_DEV) $(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) \ @@ -37,6 +37,7 @@ 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 define make_url @@ -46,5 +47,6 @@ endef $(eval $(foreach deb,$(MLNX_SDK_DEBS),$(call make_url,$(deb)))) $(eval $(foreach deb,$(MLNX_SDK_RDEBS),$(call make_url,$(deb)))) +$(eval $(foreach deb,$(PYTHON_SDK_API),$(call make_url,$(deb)))) -SONIC_ONLINE_DEBS += $(MLNX_SDK_RDEBS) +SONIC_ONLINE_DEBS += $(MLNX_SDK_RDEBS) $(PYTHON_SDK_API) From 171c6f9b9262838b3867bb8bb567ea2180f8e161 Mon Sep 17 00:00:00 2001 From: Marian Pritsak Date: Thu, 8 Dec 2016 19:12:22 +0200 Subject: [PATCH 3/3] Add runtime dependency on python api Python SX SDK API is not required for build, however it is useful package to have in syncd docker --- platform/mellanox/docker-syncd-mlnx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mellanox/docker-syncd-mlnx.mk b/platform/mellanox/docker-syncd-mlnx.mk index 990ec0f7a4cb..81d27aacea46 100644 --- a/platform/mellanox/docker-syncd-mlnx.mk +++ b/platform/mellanox/docker-syncd-mlnx.mk @@ -2,7 +2,7 @@ DOCKER_SYNCD_MLNX = docker-syncd-mlnx.gz $(DOCKER_SYNCD_MLNX)_PATH = $(PLATFORM_PATH)/docker-syncd-mlnx -$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(MFT) +$(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(MFT) $(PYTHON_SDK_API) $(DOCKER_SYNCD_MLNX)_FILES += $(MLNX_FW) $(DOCKER_SYNCD_MLNX)_LOAD_DOCKERS += $(DOCKER_BASE) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)