Skip to content

Commit 144114c

Browse files
garyachylguohan
authored andcommitted
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
1 parent 21ba8a0 commit 144114c

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ target/docker-orchagent-mlnx.gz: target/docker-base.gz $(addprefix dockers/docke
115115
docker load < $<
116116
$(call build_docker,$(patsubst target/%.gz,%,$@),$@)
117117

118-
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)
118+
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))
119119
docker load < $<
120120
$(call build_docker,$(patsubst target/%.gz,%,$@),$@)
121121

dockers/docker-orchagent/start.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ fi
3939

4040
service rsyslog start
4141

42-
if [ "$onie_platform" == "x86_64-accton_as7512_32x-r0" ]; then
43-
swssconfig /etc/ssw/AS7512/copp.json
44-
fi
45-
4642
while true; do
4743
# Check if syncd starts
4844
result=`echo -en "SELECT 1\nHLEN HIDDEN" | redis-cli | sed -n 2p`

0 commit comments

Comments
 (0)