From 526b4e0bb4cd586d3dc577d670c107afb87ba35b Mon Sep 17 00:00:00 2001 From: Denys Haryachyy Date: Sun, 2 Oct 2016 17:21:51 +0300 Subject: [PATCH 1/2] Makefile : Added swss and libnl into cavm orchagent dependencies --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d71ed93fb449..660880ae718a 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ target/docker-orchagent-mlnx.gz: target/docker-base.gz $(addprefix dockers/docke docker load < $< $(call build_docker,$(patsubst target/%.gz,%,$@),$@) -target/docker-orchagent-cavm.gz: target/docker-base.gz $(addprefix dockers/docker-orchagent-cavm/deps/,libhiredis0.13_0.13.3-2_amd64.deb libswsscommon_1.0.0_amd64.deb libsairedis_1.0.0_amd64.deb) +target/docker-orchagent-cavm.gz: target/docker-base.gz $(addprefix dockers/docker-orchagent-cavm/deps/,libhiredis0.13_0.13.3-2_amd64.deb libswsscommon_1.0.0_amd64.deb libsairedis_1.0.0_amd64.deb swss_1.0.0_amd64.deb $(LIBNL-DEBS)) docker load < $< $(call build_docker,$(patsubst target/%.gz,%,$@),$@) From a11e48ae2091c6ba661702418e7a0b730ea05405 Mon Sep 17 00:00:00 2001 From: Denys Haryachyy Date: Sun, 2 Oct 2016 20:55:21 +0300 Subject: [PATCH 2/2] docker-orchagent/start.sh : Removed Cavium specific copp config --- dockers/docker-orchagent/start.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh index 46376c4ea55d..de6467656e40 100755 --- a/dockers/docker-orchagent/start.sh +++ b/dockers/docker-orchagent/start.sh @@ -39,10 +39,6 @@ fi service rsyslog start -if [ "$onie_platform" == "x86_64-accton_as7512_32x-r0" ]; then - swssconfig /etc/ssw/AS7512/copp.json -fi - while true; do # Check if syncd starts result=`echo -en "SELECT 1\nHLEN HIDDEN" | redis-cli | sed -n 2p`