Makefile : Added swss and libnl into cavm orchagent dependencies (#24)

* Makefile : Added swss and libnl into cavm orchagent dependencies * docker-orchagent/start.sh : Removed Cavium specific copp config
sonic-net · Oct 3, 2016 · 144114c · 144114c
1 parent 21ba8a0
commit 144114c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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,%,$@),$@)
 

diff --git 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`