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

Add possibility to install debug packages during build. (#234)

Browse Source 
* Enabled common debug packages installation.

* Update gitignore.

* Make debug-packages installation disabled by default.
This commit is contained in:
antonpatenko 2017-02-04 07:38:32 +02:00 committed by lguohan
parent 2b113c4175
commit 26f4c85825
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -30,3 +30,4 @@ dockers/docker-orchagent/Dockerfile
dockers/docker-snmp-sv2/Dockerfile dockers/docker-snmp-sv2/Dockerfile
dockers/docker-team/Dockerfile dockers/docker-team/Dockerfile
dockers/docker-platform-monitor/Dockerfile dockers/docker-platform-monitor/Dockerfile
dockers/docker-base/Dockerfile

3
rules/config
View File

@ -31,3 +31,6 @@ USERNAME = admin
# PASSWORD - password for installer build # PASSWORD - password for installer build
PASSWORD = YourPaSsWoRd PASSWORD = YourPaSsWoRd
# SONIC_CONFIG_DEBUG - install debug packages
SONIC_CONFIG_DEBUG = n

10
rules/docker-base.mk
View File

@ -3,4 +3,12 @@
DOCKER_BASE = docker-base.gz DOCKER_BASE = docker-base.gz
$(DOCKER_BASE)_PATH = $(DOCKERS_PATH)/docker-base $(DOCKER_BASE)_PATH = $(DOCKERS_PATH)/docker-base
SONIC_SIMPLE_DOCKER_IMAGES += $(DOCKER_BASE) ifeq ($(SONIC_CONFIG_DEBUG),y)
GDB = gdb
VIM = vim
OPENSSH = openssh-client
SSHPASS = sshpass
$(DOCKER_BASE)_DBG_PACKAGES += $(GDB) $(VIM) $(OPENSSH) $(SSHPASS)
endif
SONIC_DOCKER_IMAGES += $(DOCKER_BASE)

1
slave.mk
View File

@ -267,6 +267,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_DOCKER_IMAGES)) : $(TARGET_PATH)/%.gz : .pl
sudo mount --bind $(PYTHON_WHEELS_PATH) $($*.gz_PATH)/python-wheels $(LOG) sudo mount --bind $(PYTHON_WHEELS_PATH) $($*.gz_PATH)/python-wheels $(LOG)
# Export variables for j2. Use path for unique variable names, e.g. docker_orchagent_debs # Export variables for j2. Use path for unique variable names, e.g. docker_orchagent_debs
$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_debs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DEPENDS),RDEPENDS))\n" | awk '!a[$$0]++')) $(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_debs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DEPENDS),RDEPENDS))\n" | awk '!a[$$0]++'))
$(eval export $(subst -,_,$(notdir $($*.gz_PATH)))_dbgs=$(shell printf "$(subst $(SPACE),\n,$(call expand,$($*.gz_DBG_PACKAGES)))\n" | awk '!a[$$0]++'))
j2 $($*.gz_PATH)/Dockerfile.j2 > $($*.gz_PATH)/Dockerfile j2 $($*.gz_PATH)/Dockerfile.j2 > $($*.gz_PATH)/Dockerfile
docker build --no-cache -t $* $($*.gz_PATH) $(LOG) docker build --no-cache -t $* $($*.gz_PATH) $(LOG)
docker save $* | gzip -c > $@ docker save $* | gzip -c > $@