matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

dockers: Add docker-platform-monitor to make all (#87)

Browse Source
This commit is contained in:
Shuotian Cheng 2016-11-30 15:44:54 -08:00 committed by GitHub
parent 55ee247f02
commit 6888eb74b2
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -170,6 +170,10 @@ target/docker-sonic-p4.gz: target/docker-base.gz $(addprefix dockers/docker-soni
docker load < $< docker load < $<
$(call build_docker,$(patsubst target/%.gz,%,$@),$@) $(call build_docker,$(patsubst target/%.gz,%,$@),$@)
target/docker-platform-monitor.gz: target/docker-base.gz
docker load < $<
$(call build_docker,$(patsubst target/%.gz,%,$@),$@)
## Rules: linux image content ## Rules: linux image content
deps/linux-image-3.16.0-4-amd64_%.deb: src/sonic-linux-kernel/linux-image-3.16.0-4-amd64_%.deb deps/linux-image-3.16.0-4-amd64_%.deb: src/sonic-linux-kernel/linux-image-3.16.0-4-amd64_%.deb
mkdir -p `dirname $@` && cp $< $(dir $@) mkdir -p `dirname $@` && cp $< $(dir $@)
@ -182,12 +186,12 @@ target/sonic-aboot.bin: deps/linux-image-3.16.0-4-amd64_3.16.7-ckt11-2+acs8u2_am
./build_debian.sh "$(USERNAME)" "$(PASSWORD_ENCRYPTED)" && TARGET_MACHINE=aboot ./build_image.sh ./build_debian.sh "$(USERNAME)" "$(PASSWORD_ENCRYPTED)" && TARGET_MACHINE=aboot ./build_image.sh
## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd ## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd
brcm-all: target/sonic-generic.bin $(addprefix target/,docker-syncd.gz docker-orchagent.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz) brcm-all: target/sonic-generic.bin $(addprefix target/,docker-syncd.gz docker-orchagent.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz docker-platform-monitor.gz)
## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd ## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd
mlnx-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-mlnx.gz docker-orchagent-mlnx.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz) mlnx-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-mlnx.gz docker-orchagent-mlnx.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz docker-platform-monitor.gz)
## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd ## Note: docker-fpm.gz must be the last to build the implicit dependency fpmsyncd
cavm-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-cavm.gz docker-orchagent-cavm.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz) cavm-all: target/sonic-generic.bin $(addprefix target/,docker-syncd-cavm.gz docker-orchagent-cavm.gz docker-fpm.gz docker-team.gz docker-database.gz docker-snmp-sv2.gz docker-lldp-sv2.gz docker-platform-monitor.gz)
p4-all: $(addprefix target/,docker-sonic-p4.gz) p4-all: $(addprefix target/,docker-sonic-p4.gz)

2
src/sonic-sairedis

@ -1 +1 @@
Subproject commit 494b231a6658a5b21b71e35ab0f078701e938742 Subproject commit 96bcb6382a12d789830d848fe05681ee75238162

2
src/sonic-swss

@ -1 +1 @@
Subproject commit 02621bcdb5689450446ea0d618a879a110af86c7 Subproject commit 05bac483585dd5e564ed5db43efb1020fa25c703

2
src/sonic-swss-common

@ -1 +1 @@
Subproject commit 947fa0733965450ad5b108cfd17a251ae3b7b709 Subproject commit 136aca5ff74d7082d0a1def8b02032689ce3507e