From 405ffb4f987eb4ed8706caa3800e8051a87b0a93 Mon Sep 17 00:00:00 2001 From: Denys Haryachyy Date: Mon, 26 Dec 2016 17:02:24 +0200 Subject: [PATCH 1/3] platform/cavium : Download debian packages --- platform/cavium/cavm-sai.mk | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/platform/cavium/cavm-sai.mk b/platform/cavium/cavm-sai.mk index 9f537c50f37c..7ba38b62a27f 100644 --- a/platform/cavium/cavm-sai.mk +++ b/platform/cavium/cavm-sai.mk @@ -1,12 +1,20 @@ # Cavium SAI +CAVM_SAI_GITHUB = https://github.com/garyachy/OpenXPS/raw/sai_0.9.5/SAI/cavm-sai/ + CAVM_LIBSAI = libsai.deb -$(CAVM_LIBSAI)_PATH = $(PLATFORM_PATH)/cavm_sdk CAVM_SAI = sai.deb -$(CAVM_SAI)_PATH = $(PLATFORM_PATH)/cavm_sdk XP_TOOLS = xp-tools.deb -$(XP_TOOLS)_PATH = $(PLATFORM_PATH)/cavm_sdk XPSHELL = xpshell.deb -$(XPSHELL)_PATH = $(PLATFORM_PATH)/cavm_sdk -SONIC_COPY_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS) $(XPSHELL) +$(CAVM_LIBSAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_LIBSAI) +$(CAVM_SAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_SAI) +$(XP_TOOLS)_URL = $(CAVM_SAI_GITHUB)/$(XP_TOOLS) +$(XPSHELL)_URL = $(CAVM_SAI_GITHUB)/$(XPSHELL) +SONIC_ONLINE_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS) $(XPSHELL) + +#$(CAVM_LIBSAI)_PATH = $(PLATFORM_PATH)/cavm_sdk +#$(CAVM_SAI)_PATH = $(PLATFORM_PATH)/cavm_sdk +#$(XP_TOOLS)_PATH = $(PLATFORM_PATH)/cavm_sdk +#$(XPSHELL)_PATH = $(PLATFORM_PATH)/cavm_sdk +#SONIC_COPY_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS) $(XPSHELL) From 352eeffd920017ac57c581fd7d6a93ed2c63d85c Mon Sep 17 00:00:00 2001 From: Denys Haryachyy Date: Mon, 26 Dec 2016 18:22:26 +0200 Subject: [PATCH 2/3] platform/cavium : Removed obsolete Makefile rules --- platform/cavium/cavm-sai.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/platform/cavium/cavm-sai.mk b/platform/cavium/cavm-sai.mk index 7ba38b62a27f..7038da04b423 100644 --- a/platform/cavium/cavm-sai.mk +++ b/platform/cavium/cavm-sai.mk @@ -12,9 +12,3 @@ $(CAVM_SAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_SAI) $(XP_TOOLS)_URL = $(CAVM_SAI_GITHUB)/$(XP_TOOLS) $(XPSHELL)_URL = $(CAVM_SAI_GITHUB)/$(XPSHELL) SONIC_ONLINE_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS) $(XPSHELL) - -#$(CAVM_LIBSAI)_PATH = $(PLATFORM_PATH)/cavm_sdk -#$(CAVM_SAI)_PATH = $(PLATFORM_PATH)/cavm_sdk -#$(XP_TOOLS)_PATH = $(PLATFORM_PATH)/cavm_sdk -#$(XPSHELL)_PATH = $(PLATFORM_PATH)/cavm_sdk -#SONIC_COPY_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS) $(XPSHELL) From 9b7dfbb6b3f371d848aabb550bb366a9179eaba3 Mon Sep 17 00:00:00 2001 From: Denys Haryachyy Date: Wed, 28 Dec 2016 15:16:08 +0200 Subject: [PATCH 3/3] platform/cavium : Replaced branch name with commit id --- platform/cavium/cavm-sai.mk | 7 +++---- platform/cavium/docker-syncd-cavm.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/cavium/cavm-sai.mk b/platform/cavium/cavm-sai.mk index 7038da04b423..c0e16e1ebd94 100644 --- a/platform/cavium/cavm-sai.mk +++ b/platform/cavium/cavm-sai.mk @@ -1,14 +1,13 @@ # Cavium SAI -CAVM_SAI_GITHUB = https://github.com/garyachy/OpenXPS/raw/sai_0.9.5/SAI/cavm-sai/ +CAVM_SAI_GITHUB = https://github.com/garyachy/OpenXPS/raw/3c2dbbee23ee76570bbdb11d4955882279cc3f9a/SAI/cavm-sai CAVM_LIBSAI = libsai.deb CAVM_SAI = sai.deb XP_TOOLS = xp-tools.deb -XPSHELL = xpshell.deb $(CAVM_LIBSAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_LIBSAI) $(CAVM_SAI)_URL = $(CAVM_SAI_GITHUB)/$(CAVM_SAI) $(XP_TOOLS)_URL = $(CAVM_SAI_GITHUB)/$(XP_TOOLS) -$(XPSHELL)_URL = $(CAVM_SAI_GITHUB)/$(XPSHELL) -SONIC_ONLINE_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS) $(XPSHELL) + +SONIC_ONLINE_DEBS += $(CAVM_LIBSAI) $(CAVM_SAI) $(XP_TOOLS) diff --git a/platform/cavium/docker-syncd-cavm.mk b/platform/cavium/docker-syncd-cavm.mk index fb0893df1eaf..ec410ca3052d 100644 --- a/platform/cavium/docker-syncd-cavm.mk +++ b/platform/cavium/docker-syncd-cavm.mk @@ -2,6 +2,6 @@ DOCKER_SYNCD_CAVM = docker-syncd-cavm.gz $(DOCKER_SYNCD_CAVM)_PATH = $(PLATFORM_PATH)/docker-syncd-cavm -$(DOCKER_SYNCD_CAVM)_DEPENDS += $(SYNCD) $(CAVM_LIBSAI) $(XP_TOOLS) $(XPSHELL) $(REDIS_TOOLS) +$(DOCKER_SYNCD_CAVM)_DEPENDS += $(SYNCD) $(CAVM_LIBSAI) $(XP_TOOLS) $(REDIS_TOOLS) $(DOCKER_SYNCD_CAVM)_LOAD_DOCKERS += $(DOCKER_BASE) SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM)