From patchwork Mon Jul 2 14:30:20 2018 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: 140787 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp35701ljj; Mon, 2 Jul 2018 07:42:09 -0700 (PDT) X-Google-Smtp-Source: AAOMgpd+fllgO2F8XINPx9mJBxdO2n3cAekO/UryMSsTF2WiXDuoNTIZF94fD09NGauPsVJLK2F5 X-Received: by 2002:a37:258b:: with SMTP id l11-v6mr21623548qkl.438.1530542529443; Mon, 02 Jul 2018 07:42:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530542529; cv=none; d=google.com; s=arc-20160816; b=vgAd+4E1piZX6hweeLbvaEcYiL0gQ3AIWd/d2qCjYgdvZBCUuSYFWqFWqw+l4fDJmC II9lMa9tTWHQH2veeV+DcnTdU6fke3y0TUvu2A4P9oa+nhqzY1xmlmgtNMcpnn1QiL92 jNTGq9fHWZ/f+krZ/CW1nQYmpYDSjYdYHAy9l6bygbjxYeAJ06KvcDgvXtfPUnAlg9nM fllNdWm5QT7n+RbP0+GPenGeFNJAmoFdddc9LAuZMaW7gu4dRL99UjhJ7ziQLArW5gT4 gfPAtHWrTQHqW7HE5QZ7rwYJmXXkUqVCOwjW5tmQmonR1RsZASE6H1I6UxA+qv3UIN8j 9Jbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=0nsvRvi2RwFuj1hDdIOU0UbiIiw/TTK7wMAJpOafoSs=; b=G/ZJ+FwYShwgv3A1oigpXRLe/Ssbo3zVS75WfveuEJrmpRm4gSM1avmyTlaj7QK548 YdTH2Hz/PRPRFTDdvBCjMDIes7114d6htf2sw3bmLYg+GbSh2TjEd3eQbFXqeRlitkoN pg6BkleXXLYunzA1Xs4JznKOtVGFEiuxQdcCEnKd83iEjOdipN9aDzem4N0V8bpM8QlV LiXnizpdLL+sfIVBJqa1rkD04jZAto7LU+jC8XMohyjvJPaVYdqSYtcSzHRC0Z8VZiz/ Xzw2tEuer1f+79Km6kVa1QViE30fWmSR1RIpKJkR8pX5J2lgOJWt0MWSbifsG6qiUqRq CY2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ePesqPGa; 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 sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d192-v6si4725885qkb.390.2018.07.02.07.42.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 07:42:09 -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 header.s=google header.b=ePesqPGa; 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 sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa01o-00064p-OT for patch@linaro.org; Mon, 02 Jul 2018 10:42:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58302) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzxw-00035K-Pe for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzxr-0005BF-PU for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:08 -0400 Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:53109) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzxr-0005Ad-JQ for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:03 -0400 Received: by mail-wm0-x230.google.com with SMTP id w16-v6so8652847wmc.2 for ; Mon, 02 Jul 2018 07:38:03 -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=0nsvRvi2RwFuj1hDdIOU0UbiIiw/TTK7wMAJpOafoSs=; b=ePesqPGaicBt1fYqi41r/MM12oRpKiHnV3WIoBh5bNRtizmba7d586L85QMJsfWiBq pVaqZy9ujlgei3QDr54onLMSFeD6A6u0bwBI1UuwYWg0xwL+MDHRfQG/+i315SSeanvg l2jzkkoSWujNhwrM6EEqdXYoVlo3CMj1hiqHE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0nsvRvi2RwFuj1hDdIOU0UbiIiw/TTK7wMAJpOafoSs=; b=ICxhXlGBXQpIDnc8F9nlvm1nbThNtn1saerXm0jiJDMIs0dnByz2svryUtslatWBNY 5zXHm+ms2EYV3iH/TnUuCZtI/ngGh49Vj/GCcYd7SYzXmRffo6g48KX5CBapAmVTg1YX +rKemtHuKH/U8v+dL1yr0FCFdSq7vV1EKfPG4ROdq1ekP85Ok2WW9B+IlJspolf28GVw BvM8jPXgceS3WtAt519XUDj9v3Bz82G6Znp9eea6K3mq49hqcFFZdAEDFB8u9ovbqJRN OkZGMD0T5Rx+qeDPpuBsLttZc/sLqGNE/hplyIo3OQdSBX4JChWQNgTrMJbB5oIutRIh TdFQ== X-Gm-Message-State: APt69E0h7dID7gA6TIt6pU+0eAZx5MgcrGBTLnV23BniJDdqIbekKzYQ dfnm/vpgdKIX3/JzbNzjczCtSA== X-Received: by 2002:a1c:6709:: with SMTP id b9-v6mr7923679wmc.30.1530542282434; Mon, 02 Jul 2018 07:38:02 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r9-v6sm12701492wrs.63.2018.07.02.07.38.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:38:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4C2D53E0B75; Mon, 2 Jul 2018 15:30:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 2 Jul 2018 15:30:20 +0100 Message-Id: <20180702143021.18864-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::230 Subject: [Qemu-devel] [PATCH v3 19/20] docker: add special rule for deboostrapped 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: pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We might as well have a custom rule for this. For one thing the dependencies are different. As the primary dependency for docker-image-% could never be docker-image-debian-bootstrap we can drop that test in the main rule as well. Signed-off-by: Alex Bennée --- v3: - changed rule to docker-binfmt-image-debian-%: - leave executable in the main rule - rm stray whitespace fix --- tests/docker/Makefile.include | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8641f5da2c..fdc87b8a57 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -49,9 +49,6 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker "CHECK", "$*") else docker-image-%: $(DOCKER_FILES_DIR)/%.docker - @if test "$@" = docker-image-debian-bootstrap -a -z "$(EXECUTABLE)"; then \ - echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1 ; \ - fi $(call quiet-command,\ $(DOCKER_SCRIPT) build qemu:$* $< \ $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ @@ -59,6 +56,26 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") + +# Special rule for debootstraped binfmt linux-user images +docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker + @if test -z "$(EXECUTABLE)"; then \ + echo WARNING: EXECUTABLE is not set, debootstrap may fail. 2>&1 ; \ + fi + @if test -z "$(DEB_ARCH)"; then \ + echo WARNING: DEB_ARCH is not set, debootstrap may fail. 2>&1 ; \ + fi + @if test -z "$(DEB_TYPE)"; then \ + echo WARNING: DEB_TYPE is not set, debootstrap may fail. 2>&1 ; \ + fi + $(call quiet-command, \ + $(DOCKER_SCRIPT) build qemu:debian-$* $< \ + $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(NOUSER),,--add-current-user) \ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)), \ + "BUILD","binfmt debian-$* (debootstrapped)") + endif # Enforce dependencies for composite images