diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2016-07-19 21:20:45 +0800 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2016-07-20 19:19:43 +0800 |
| commit | b7c851b2b8fad740c41a827cd6a329990d4c65d9 (patch) | |
| tree | 490754075e120d16e8a429bddba5f2f3e61d30de /tests | |
| parent | ff31e2256d7c984d3c4aa06f38ecd54c5138549d (diff) | |
| download | qemu-b7c851b2b8fad740c41a827cd6a329990d4c65d9.tar.gz | |
docker: pass EXECUTABLE to build script
To build a docker image with which needs qemu linux-user emulation we
need to pass --include-executable to the build script. Using the same
mechanism as for other container controls we enable the option is
EXECUTABLE is set on the make command line e.g:
make docker-image-debian-bootstrap V=1 J=9 DEB_ARCH=armhf \
DEB_TYPE=stable EXECUTABLE=./arm-linux-user/qemu-arm
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1468934445-32183-11-git-send-email-famz@redhat.com
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/docker/Makefile.include | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e7f0023f86..78af46837b 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -46,7 +46,8 @@ docker-image: ${DOCKER_TARGETS} docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ $(SRC_PATH)/tests/docker/docker.py build qemu:$* $< \ - $(if $V,,--quiet) $(if $(NOCACHE),--no-cache),\ + $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ " BUILD $*") # Expand all the pre-requistes for each docker image and test combination @@ -95,6 +96,7 @@ docker: @echo ' DEBUG=1 Stop and drop to shell in the created container' @echo ' before running the command.' @echo ' NOCACHE=1 Ignore cache when build images.' + @echo ' EXECUTABLE=<path> Include executable in image.' docker-run-%: CMD = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\1/') docker-run-%: IMAGE = $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\(.*\)/\2/') |