From patchwork Fri Oct 28 16:33:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 79987 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1273022qge; Fri, 28 Oct 2016 09:49:40 -0700 (PDT) X-Received: by 10.176.6.70 with SMTP id f64mr12959918uaf.118.1477673380662; Fri, 28 Oct 2016 09:49:40 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 98si6690756uaj.30.2016.10.28.09.49.40 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 28 Oct 2016 09:49:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0ALb-0001cw-Gz for patch@linaro.org; Fri, 28 Oct 2016 12:49:39 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gxVoqkAs1VaOdhnz53YbTqtoRONThwdthgt5K/6dKwk=; b=Mc3uCVUBGTr3yiVAvFq4SCXxjABLYa2ZKmTU3TJ5srtLMTBPHsTeylAj1Ulv3YMNzy kFuTXNOpCuiwhwGk2vmvXBj9Twthr/jMSspMxkEGmgy29bZmV/OdDrQFMxa31S++lN9x 5ZVghCBQiIvF4dSzGrNJFQbEzk2UrTow71BM8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gxVoqkAs1VaOdhnz53YbTqtoRONThwdthgt5K/6dKwk=; b=ibRHJMe6Y74n1Lx+TeAldNGA2z1c8F8boQ/rfi0rz5R1nYyDzPLgPu6acS4/KGegPc 5S84NjIbmLx2pcHaYExx2gMLwox15KCTSOtvyzLgW1BzfoAunYrsfb2tvd/9SOCje/32 WkoD2d5uWqnAnfWU+fnttNC7byjdOQ/76cnrsnNh739FZmG/PHRtPj0hcOd+KjlmDXXz hKYo8Kh5HflqXsC77RvQYUVv1M6wOMv3IrL9CM7lD4ntb0O48n6ZaN61sHWqlMcsKGgn oloGyqGJ27RNeOBbrxEoTSQWASBVlFIZUtZZT6Is59Y2uUud2UQtNXUXjFl8sMsYK6Ag Kprw== X-Gm-Message-State: ABUngvcBf8BZ3G4oRzmnFY4bxiw/3xUKGF2JTNATDEMUNso1WK72QCCngoHVNUztCZ8uHa/F X-Received: by 10.194.154.227 with SMTP id vr3mr12851352wjb.127.1477672427822; Fri, 28 Oct 2016 09:33:47 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id pe5sm14941827wjb.15.2016.10.28.09.33.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Oct 2016 09:33:44 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id EB38F3E02DF; Fri, 28 Oct 2016 17:33:42 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: famz@redhat.com Date: Fri, 28 Oct 2016 17:33:37 +0100 Message-Id: <20161028163339.31096-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161028163339.31096-1-alex.bennee@linaro.org> References: <20161028163339.31096-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PATCH 4/6] tests/docker/Makefile: Add a rule for Debian user images X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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(+) -- 2.10.1 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