From nobody Tue Nov 4 21:59:32 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 1531485085382841.4944485015186; Fri, 13 Jul 2018 05:31:25 -0700 (PDT) Received: from localhost ([::1]:37046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxEG-00072M-2S for importer@patchew.org; Fri, 13 Jul 2018 08:31:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxAR-0004I9-Qd for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdxAO-00023g-MC for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:23 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33029) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdxAO-00022T-FM for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:27:20 -0400 Received: by mail-wm0-x241.google.com with SMTP id z6-v6so4411870wma.0 for ; Fri, 13 Jul 2018 05:27:20 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t70-v6sm1432729wme.7.2018.07.13.05.27.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:27:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DA7913E085B; Fri, 13 Jul 2018 13:17:42 +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=fkW34Ukxv5r13E+snBuRqSy0q9jT96LqwwJjgNg8Gfc=; b=VdW51k+PQVvxZUOP5/k6oRoi9k+fHM1Qa78e72d1BpApfPCEx1tdWJoGtTr0NKM8NP 6r7bfxM45tMPCz187plT20StTAJWdg4Cg18fVkdtc198wb9PMCMQwNCKXyQ94jrwzF4d jSAqkpfDURZPnLWMG9EMbs532p3lG04+Fs2F0= 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=fkW34Ukxv5r13E+snBuRqSy0q9jT96LqwwJjgNg8Gfc=; b=N6nq26ed9rL7MyltIRPpnMwtjO/YIPTqbWbezL7kJo2csM66HcSQlKBgQyGJbD7uAP nZQPqJ9zYNcO4ESTnbmB0qukHNS2n4KRV0tMth4LvQcGCecnFYjMNk2xfuVXzatNQNs7 E/vyxnLhk/1gLkK9rJq1q5sBwEBofqG57XIIm5/i5Whmn3nTt2jWU/2TqSAW+/eO2UMk mQZfT/NAOiI52zfEhVj1IeIzRH8yd3+nND8uuoyyp/59HFW7oF/7AJx6o0dEAlQH+SL3 WprSP+njFJLRcxKG/k6tQRWa/KsHaI9umE4IPJIs1k1QPU/ieEsJDC/GURa6VZSozX6n uKeg== X-Gm-Message-State: AOUpUlGpT7mmrwuo8maY/3HaJbljlqL2CGRoh2th/+TEaYyxeLTC74HL xMRqUlULgn3s8P1oo96xLXd7Mg== X-Google-Smtp-Source: AAOMgpfPPojtpaSGR4D8LQqcckbJgIVRpi14sr0hMwZBn/l285HstJoKE6T+CoZqnpIfz6BeZnYoIw== X-Received: by 2002:a1c:93d2:: with SMTP id v201-v6mr1761597wmd.77.1531484839339; Fri, 13 Jul 2018 05:27:19 -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: Fri, 13 Jul 2018 13:17:37 +0100 Message-Id: <20180713121741.19262-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180713121741.19262-1-alex.bennee@linaro.org> References: <20180713121741.19262-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::241 Subject: [Qemu-devel] [PATCH v2 for 3.0 12/16] docker: drop QEMU_TARGET check, fallback in EXECUTABLE not set 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+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 The addition of QEMU_TARGET was intended to ensure we fall back to checking for the existence of an image if the build system was not currently configured to build it. However this breaks the direct use of the rule for building custom binfmt_misc images. We already check for EXECUTABLE so let us just use that as a proxy for deciding if we are just going to check the image exits. Signed-off-by: Alex Benn=C3=A9e Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e32c35be0d..ec23620153 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -58,13 +58,11 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker $(if $(EXECUTABLE),,\ $(error EXECUTABLE not set, debootstrap of debian-$* would fail)) - $(if $(wildcard $(EXECUTABLE)),,\ - $(error Please build $(EXECUTABLE) first)) $(if $(DEB_ARCH),,\ $(error DEB_ARCH not set, debootstrap of debian-$* would fail)) $(if $(DEB_TYPE),,\ $(error DEB_TYPE not set, debootstrap of debian-$* would fail)) - $(if $(filter $(QEMU_TARGET),$(TARGET_DIRS)), \ + $(if $(wildcard $(EXECUTABLE)), \ $(call quiet-command, \ DEB_ARCH=3D$(DEB_ARCH) \ DEB_TYPE=3D$(DEB_TYPE) \ @@ -136,7 +134,6 @@ DOCKER_PARTIAL_IMAGES +=3D debian-tricore-cross debian-= powerpc-cross fedora-i386-c # broken so we need a qemu-linux-user for this target docker-binfmt-image-debian-powerpc-user: DEB_ARCH =3D powerpc docker-binfmt-image-debian-powerpc-user: DEB_TYPE =3D jessie -docker-binfmt-image-debian-powerpc-user: QEMU_TARGET =3D ppc-linux-user docker-binfmt-image-debian-powerpc-user: EXECUTABLE =3D ${BUILD_DIR}/ppc-l= inux-user/qemu-ppc docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc= -user DOCKER_USER_IMAGES +=3D debian-powerpc-user --=20 2.17.1