[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 10/10] docker: pass EXECUTABLE to build script
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v7 10/10] docker: pass EXECUTABLE to build script |
Date: |
Tue, 19 Jul 2016 21:20:45 +0800 |
From: Alex Bennée <address@hidden>
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 <address@hidden>
---
tests/docker/Makefile.include | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index e7f0023..78af468 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-\(address@hidden)@\(.*\)/\1/')
docker-run-%: IMAGE = $(shell echo '$@' | sed -e
's/docker-run-\(address@hidden)@\(.*\)/\2/')
--
2.7.4
- [Qemu-devel] [PATCH v7 00/10] docker: Support building qemu-user powered docker test images, Fam Zheng, 2016/07/19
- [Qemu-devel] [PATCH v7 01/10] tests/docker/docker.py: docker_dir outside build, Fam Zheng, 2016/07/19
- [Qemu-devel] [PATCH v7 02/10] tests/docker/docker.py: support --include-executable, Fam Zheng, 2016/07/19
- [Qemu-devel] [PATCH v7 03/10] tests/docker/docker.py: check and run .pre script, Fam Zheng, 2016/07/19
- [Qemu-devel] [PATCH v7 04/10] tests/docker/dockerfiles: new debian-bootstrap.docker, Fam Zheng, 2016/07/19
- [Qemu-devel] [PATCH v7 05/10] tests/docker/docker.py: add update operation, Fam Zheng, 2016/07/19
- [Qemu-devel] [PATCH v7 06/10] docker: More sensible run script, Fam Zheng, 2016/07/19
- [Qemu-devel] [PATCH v7 07/10] docker: Fix exit code if $CMD failed, Fam Zheng, 2016/07/19
- [Qemu-devel] [PATCH v7 08/10] docker: Add "images" subcommand to docker.py, Fam Zheng, 2016/07/19
- [Qemu-devel] [PATCH v7 10/10] docker: pass EXECUTABLE to build script,
Fam Zheng <=
- [Qemu-devel] [PATCH v7 09/10] docker: Don't start a container that doesn't exist, Fam Zheng, 2016/07/19