From patchwork Fri Jun 29 20:52:30 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: 140652 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1309477ljj; Fri, 29 Jun 2018 14:06:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdO2NIrrex2/VoLBLYEYrEv6EzaLuQ27CzGppyeM4gOQW7Jv/HDM90S1YUG45dUxlYyuM9W X-Received: by 2002:a0c:a3c3:: with SMTP id v61-v6mr14317982qvv.99.1530306419867; Fri, 29 Jun 2018 14:06:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530306419; cv=none; d=google.com; s=arc-20160816; b=Vl3RiinLkyd7NSHVJfNr272QKYGu7gf6u9c6paYQsAPeeUL5iwkkEi+AQ1SjU6/feq PIQh/FgherMu12g83UxTd7jIhi2W9Wvht5vq9kvV7KUUOL1l9QoJSj5eXJzNT/64DnTi G69X+Iz3924Q+CQsX3fqaUkbNnFD+pp1e5a7e1R7aGgBHo+pABos0waf8z4Wp+2X/iZs NR4lG5Cz8C3Au180OvifO7mdjBXrKOH9rNs9gZUOBvH9My0om4v/dht63UWY2f2xkJZL YKQB+gEZxtho0W/DMM8wrw1dEQOXx77oEz2Rxj0W1AWmEOcZbugIWAHny/rs3v7s0eCP 1Dcg== 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=cMONYfGIlPAYO3X2aGTb0IueynVjU6yk4JkumEnisoU=; b=g/hSxRqK+3pq5K+5b0FbXOde9Vz1T8S5Ar4e1zsdX0cjfI1YgeIUHaXidVzqMYJKTH TNieL2xsBb1zs9mXDV8avPony2TkZNecznJPHTuU6Vh/S1G+ZAlTt+KCxEdiTWfjc7uu 1kPElndWuEeGw8JE6Vx0IZK3mTvAGOWssDCSXUDnPLHlJRnBl3O3aNuSThUIup59X70Q 37p8uqOGHIr/qqGos3oNGbKQEpoAqrLuez+Gv46JEIOtsCmJARW6lVmDq/0L/ba9m87x qBWFz+Jm1Yq3p3FRXlMf6a892SwArtKUzqb0t19fWCjHJK3WWu0JrenqvR8Woxq3FmsH fUng== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Lvy+vfn+; 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 c9-v6si9804121qtp.300.2018.06.29.14.06.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 29 Jun 2018 14:06:59 -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=Lvy+vfn+; 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]:44492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0bb-00060Z-AQ for patch@linaro.org; Fri, 29 Jun 2018 17:06:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ0Sj-0004Gj-UM for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ0Si-0005LQ-BI for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:49 -0400 Received: from mail-wr0-x234.google.com ([2a00:1450:400c:c0c::234]:46941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ0Si-0005Kh-4T for qemu-devel@nongnu.org; Fri, 29 Jun 2018 16:57:48 -0400 Received: by mail-wr0-x234.google.com with SMTP id s11-v6so755784wra.13 for ; Fri, 29 Jun 2018 13:57:47 -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=cMONYfGIlPAYO3X2aGTb0IueynVjU6yk4JkumEnisoU=; b=Lvy+vfn+XYzZxAbX8nQ1kEHYZXYB015VvvWxVkkARQ6IEsIUliOCSRHE0KUjqhRxP7 BBS35LXfU8/hnACr2Q7br7HrRDVHHk23iVnCsKtR04BQeJujRsLzY3LGJEatWOqVS0TL PPnvSidijpPukhURGER6IHfKSc7JhjNuh+zJo= 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=cMONYfGIlPAYO3X2aGTb0IueynVjU6yk4JkumEnisoU=; b=Vpe0ZZ+WaUcIdQl5X/Pom9VLuXkCWlEO55rp8OyF2ZNP44jkM+2hbZ2Y9DCrxY15Sr NOHeHNi+ubR/x1gRLHAINRe2pej+HsU95DMaLBAszaRNwpxDVFFs4eDC8ZdokplQ4CdK Mgsf8XUqkUDzNZvU7uZrD70Eh/fUEy1xIVSlSr8NT6xbh9LTJ626hy7LvQF6yyzzhm7n K1bQ+VY364nB9hKa66AjAeaKGfgWv3LehGlmAJBcnmSAeQkmXiJCz0z2TvZetYqcKObx VjPewXL0wGhrHMg93AFN7EN+VMm9UIFI5itqUCNaycaxL/wd0TUHxS9tjo+XwrLaIETQ 7Gsg== X-Gm-Message-State: APt69E3aI6Rz08DTKU7OmV7Y1iczR61iK3wXkOFqJrDl3bjkiZv+Bd3R IjkUp+jWPWM2EoZrUa2Bk9MifQ== X-Received: by 2002:a5d:4503:: with SMTP id s3-v6mr13235042wrq.191.1530305866936; Fri, 29 Jun 2018 13:57:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z14-v6sm12069661wrm.49.2018.06.29.13.57.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 13:57:42 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4A1063E0B71; Fri, 29 Jun 2018 21:52:34 +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: Fri, 29 Jun 2018 21:52:30 +0100 Message-Id: <20180629205232.27190-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629205232.27190-1-alex.bennee@linaro.org> References: <20180629205232.27190-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:c0c::234 Subject: [Qemu-devel] [PATCH v2 19/21] 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 things the dependencies are different. We drop the test and EXECUTABLE lines from the general rule as they are no longer needed there. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8641f5da2c..d3bd2f57dd 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -49,16 +49,32 @@ 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) \ $(if $(NOUSER),,--add-current-user) \ - $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ - $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES)),\ "BUILD","$*") + +# special rule for debootstrapped debian-FOO-user images +docker-image-debian-%-user: $(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-$*-user $< \ + $(if $V,,--quiet) $(if $(NOCACHE),--no-cache) \ + $(if $(NOUSER),,--add-current-user) \ + $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ + $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)) \ + -E DEB_ARCH=${DEB_ARCH} -E DEB_TYPE=${DEB_TYPE}, \ + "BUILD","debian-$*-user (debootstrapped linux-user)") endif # Enforce dependencies for composite images