From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0A6I-0004kr-FF for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:33:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c0A6H-0003Hh-EW for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:33:50 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:35970) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c0A6H-0003HF-8B for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:33:49 -0400 Received: by mail-wm0-x231.google.com with SMTP id p190so22493443wmp.1 for ; Fri, 28 Oct 2016 09:33:49 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= Date: Fri, 28 Oct 2016 17:33:37 +0100 Message-Id: <20161028163339.31096-5-alex.bennee@linaro.org> In-Reply-To: <20161028163339.31096-1-alex.bennee@linaro.org> References: <20161028163339.31096-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 4/6] tests/docker/Makefile: Add a rule for Debian user images List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: famz@redhat.com Cc: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= This allows you to create Debian images powered by a qemu linux-user binary. Later patches will list these in the help file but for now: make docker-image-debian-stable-arm64 Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d91e28b..bb9e078 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -64,6 +64,22 @@ $(foreach i,$(DOCKER_IMAGES), \ ) \ ) +# Additional Debian qemu-user images +# +# These images are built using the generic debian-bootstrap image and a qemu-user binary +# +docker-image-debian-%: DEB_TYPE = $(shell echo '$@' | sed -e 's/docker-image-debian-\([^@]*\)-\(.*\)/\1/') +docker-image-debian-%: DEB_ARCH = $(shell echo '$@' | sed -e 's/docker-image-debian-\([^@]*\)-\(.*\)/\2/') +docker-image-debian-%: QEMU_ARCH = $(subst arm64,aarch64,$(subst armhf,arm,$(DEB_ARCH))) +docker-image-debian-%: QEMU_EXEC=$(BUILD_DIR)/$(QEMU_ARCH)-linux-user/qemu-$(QEMU_ARCH) +docker-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker + $(call quiet-command,\ + DEB_ARCH=$(DEB_ARCH) DEB_TYPE=$(DEB_TYPE) \ + $(SRC_PATH)/tests/docker/docker.py build qemu:debian-$* $< \ + $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + --include-executable=$(QEMU_EXEC),\ + "BUILD USER","$*") + docker: @echo 'Build QEMU and run tests inside Docker containers' @echo -- 2.10.1