From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUxU-000252-QU for qemu-devel@nongnu.org; Tue, 19 Jul 2016 09:21:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bPUxP-0001jK-UR for qemu-devel@nongnu.org; Tue, 19 Jul 2016 09:21:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60706) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bPUxP-0001jE-Od for qemu-devel@nongnu.org; Tue, 19 Jul 2016 09:21:07 -0400 From: Fam Zheng Date: Tue, 19 Jul 2016 21:20:45 +0800 Message-Id: <1468934445-32183-11-git-send-email-famz@redhat.com> In-Reply-To: <1468934445-32183-1-git-send-email-famz@redhat.com> References: <1468934445-32183-1-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v7 10/10] docker: pass EXECUTABLE to build script List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, famz@redhat.com From: Alex Benn=C3=A9e 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=3D1 J=3D9 DEB_ARCH=3Darmhf \ DEB_TYPE=3Dstable EXECUTABLE=3D./arm-linux-user/qemu-arm Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.includ= e 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=3D$(EXECUTABLE)),\ " BUILD $*") =20 # Expand all the pre-requistes for each docker image and test combinatio= n @@ -95,6 +96,7 @@ docker: @echo ' DEBUG=3D1 Stop and drop to shell in the created= container' @echo ' before running the command.' @echo ' NOCACHE=3D1 Ignore cache when build images.' + @echo ' EXECUTABLE=3D Include executable in image.' =20 docker-run-%: CMD =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)= @\(.*\)/\1/') docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*= \)@\(.*\)/\2/') --=20 2.7.4