From nobody Wed Nov 5 08:45:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153054260165040.791261771811946; Mon, 2 Jul 2018 07:43:21 -0700 (PDT) Received: from localhost ([::1]:33217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa02y-00070P-Sm for importer@patchew.org; Mon, 02 Jul 2018 10:43:20 -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) 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) 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-Google-Smtp-Source: AAOMgpcKY+/xMqHSxvJxgn+IpKuP6JqUmDK5EygNyO/otk8kghSzRFU51WYNINcwecKLH0iQT7AYKA== X-Received: by 2002:a1c:6709:: with SMTP id b9-v6mr7923679wmc.30.1530542282434; Mon, 02 Jul 2018 07:38:02 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- 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(-) 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 "$@" =3D docker-image-debian-bootstrap -a -z "$(EXECUTABLE)"; th= en \ - 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=3D$(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=3D$(EXECUTABLE)), \ + "BUILD","binfmt debian-$* (debootstrapped)") + endif =20 # Enforce dependencies for composite images --=20 2.17.1