From nobody Wed Nov 5 02:32:10 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 1531858779934975.7330150653462; Tue, 17 Jul 2018 13:19:39 -0700 (PDT) Received: from localhost ([::1]:32985 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWHu-00056k-DA for importer@patchew.org; Tue, 17 Jul 2018 16:09:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffW4z-00039h-4J for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffW4u-0004lN-FZ for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:13 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:33080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffW4u-0004kl-8u for qemu-devel@nongnu.org; Tue, 17 Jul 2018 15:56:08 -0400 Received: by mail-wm0-x243.google.com with SMTP id z6-v6so13357279wma.0 for ; Tue, 17 Jul 2018 12:56:08 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e7-v6sm3811853wrm.14.2018.07.17.12.55.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Jul 2018 12:56:01 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C787A3E0BBD; Tue, 17 Jul 2018 20:55:54 +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=ijZLzag+tuxX50+7VFzVKtmQJvhoutHNmggbjMrVO88=; b=ZGfr5WDfkp2buIlchgcKNoOELwiv4w3Ja6BJxsU70urkLUcQ2DVfHVgKNh2w0JnI7x DYxMxO6xBF7tMponmDWTMyJyZ5+8iCljT4jOq9E1Vz63KxxxOlUWuoiIgIpv88IqyA5X 0B8p/EPGVT3eXWIZgct81D35Vmmi72V2LjxhA= 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=ijZLzag+tuxX50+7VFzVKtmQJvhoutHNmggbjMrVO88=; b=sz7z0JB7Ws41I69HVdTXVx+0crhYnzh6lPcC28WaBUi9rstXQOTzW/BN8mcHgTlNM6 cFbReuHzxTp0DS5p6PKiNkEAxNd6dMMH635dwws5wJ/mSaiB6khR/g6LVzPXOjt+6Izh G/HeCcGE5qOk5PM8ylmzU+AHlt59Gfri8wZM98Z4JilWrHQO2CajBl0urvtyb/T7CVjf 6OvEbdf45Vss5tB0SXtd6aWAwB/wqkoFcdla9X9CSnDa0lOoYkF3Hy9W6mSFJhvfYUh+ tHKpbjbBHsuoRYt/ttLrhcFrTpRdAP7XGgyjJm++pCO5MYhablF18MOH9murJC+veHco egBA== X-Gm-Message-State: AOUpUlGXRYM1fW2wE26+Y1czKrp4z4wAh8lzlxUzKxKCapiDWzjMtiVb n7paDkq56MdIqzd/UTL724gjvw== X-Google-Smtp-Source: AAOMgpcxvD9HuG3+c7I64O2if38JlyP1alt+jlBQlEy2EidyZnjyhihe4Dqqb7she2QGL9Gk6EMPjg== X-Received: by 2002:a1c:aa8f:: with SMTP id t137-v6mr2130694wme.54.1531857367058; Tue, 17 Jul 2018 12:56:07 -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: Tue, 17 Jul 2018 20:55:47 +0100 Message-Id: <20180717195553.9111-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717195553.9111-1-alex.bennee@linaro.org> References: <20180717195553.9111-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::243 Subject: [Qemu-devel] [PATCH v3 for 3.0 12/18] 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