From patchwork Fri Jul 13 12:17:37 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: 141879 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp742760ljj; Fri, 13 Jul 2018 05:30:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe/GbwAFNP2RmJSpYzZAxvRPgq5Zbm05tQm9kc5+pM1JDjcQp7zFpiC1cyfhJc4axtt3w8E X-Received: by 2002:a0c:d5b0:: with SMTP id g45-v6mr6789454qvi.162.1531485002869; Fri, 13 Jul 2018 05:30:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531485002; cv=none; d=google.com; s=arc-20160816; b=OU0kr12473w5LFw9ckxt/5QnPqjDLkcegDGaChYZ16zQZyeGwhVz14lUOg+zLuXybD 4laQgfDHBZ7IXv1ikx6QXU1ivGgi2fsnsza12S7HwUDm7JB+KFoJ03WFeoAPc3eIo15p /DD3wp+uOEgyzBbeCDOVhH1/hoI9bFL36Fpl/kQF7/x/O8Wp/buUEFDh/jJRILpkgZD5 /IH75uwTwChTlXCgcvhWoljE872SuQl8xGSLjoRyynQB/Rg7Q/SJL+XZhukdcYlQItBA iGaC66ZHobSGx+Rz2aQ7UxOcwZl2X7lNjkZksBwUJzis/aGI0YrQ55iwmkyT3x8pHnCy rl7Q== 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=fkW34Ukxv5r13E+snBuRqSy0q9jT96LqwwJjgNg8Gfc=; b=GQYxt9QYwwskCGKiuOKXOziydLqltjw59elXi+aOFvcdhCZPZvN5eaFGoDUohyqs5y pUQX4z8LKbxoh4cP81sKmVQP4RQ57GGR5avAvj2tiZEw30/+P7ds32G9lr036i7Q8rUN ITy8/qm2SiRmrtrhDrCuaq9MzEgj4VZ8dGSm4KI88gP8chZG7GA9Gd4eFYM6bHK7DayO lpNhCS2PVayF2/HcmYs+t4yRJ+m1n6wlVbM5/ZoFAf/Be4w6ZSr2BnKJfZtgZkp7G50R VtQUE2p8GiUSkd4iLJYCE/JGNxKTnFFMXRo1T/ib77tMR0v7yrmeyVMH7VdGtcZvFewm tarA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=VdW51k+P; 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 t21-v6si8298664qtg.392.2018.07.13.05.30.02 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 13 Jul 2018 05:30:02 -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=VdW51k+P; 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]:37036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxD0-00066l-AS for patch@linaro.org; Fri, 13 Jul 2018 08:30:02 -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) 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-Received: by 2002:a1c:93d2:: with SMTP id v201-v6mr1761597wmd.77.1531484839339; Fri, 13 Jul 2018 05:27:19 -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) 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, 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 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_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée --- tests/docker/Makefile.include | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.17.1 Tested-by: Philippe Mathieu-Daudé 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=$(DEB_ARCH) \ DEB_TYPE=$(DEB_TYPE) \ @@ -136,7 +134,6 @@ DOCKER_PARTIAL_IMAGES += 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 = powerpc docker-binfmt-image-debian-powerpc-user: DEB_TYPE = jessie -docker-binfmt-image-debian-powerpc-user: QEMU_TARGET = ppc-linux-user docker-binfmt-image-debian-powerpc-user: EXECUTABLE = ${BUILD_DIR}/ppc-linux-user/qemu-ppc docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user