From patchwork Tue Jul 24 10:51:03 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: 142756 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp7118296ljj; Tue, 24 Jul 2018 03:56:58 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe6C2VREJ/LtmYLYTDNOSFVcITSPMPHLj1Q4KLd8cUD6m1TOptWKCjLoeYWWPKbfCNf86Ed X-Received: by 2002:a37:c68d:: with SMTP id s13-v6mr12290182qkl.31.1532429818199; Tue, 24 Jul 2018 03:56:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532429818; cv=none; d=google.com; s=arc-20160816; b=iVDALdH0F8Pperrij2UJpOLP/J93vHJbe4SMpnvK7H6R2dVV2lV3W1uAWz3VlGIKVA mmIh2n9XniEcWs4AazGCFQS9cew3g4+Daqb1Ck06qqDXBrV4zjdQ2JLWpOeBVTKfZfx1 bv6QYIlkUpDP1XIKyNLpFRMoYiV/BQ8WDzg5KxXJtADCxe7BAnLadJ1qAEDW1xlX1WOM o0glwMlW2uLyno3dUvY6cLBySndEijgp6N//KzhYccRN5TSEtfbzn92ZZFl7jPuePAXb TtoegRi7n6BUv52u7oT6b4RwZxckQ81XChEuCPcaR+t+KMcfcvrRoJsl8IWaGk+xIHf6 5Ipw== 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=oBOyisWYvelL8YHME7eneb5/LPBvVj5hhLp7keQSuw4=; b=dkHE6eSjBrJlSt/GaPrWYKE5iLOcYYl7hijODIOJ8vpKR/8hecGV/DRzSy/EngcHp4 SyUjU5XUBIkKtPMkrwLdLvhvx5WgowhD9EqkW7M3U4UBoC3kDnq1vAQe8VGsnWUhHSP9 k4IZyhRmCtb4F64Nqs1xGi7IBHpXI3CqDixY5su8YQSMTtVS10JjxGfUbW06HsYEoT8s qmcFPhz1wF/kRhEJMDDE/dlUfKxvlkmstyu5qWKFwG2baZ2UBzjZ3o2q64n2HW7jyPEF Bop0f0JiY7FCC5etE/UcuBKEkuPhpU8SAy9ba05ebcll2zQJOcb8mS+Cgm+kD6W+b3f7 vpSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XAoPvIvN; 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 u126-v6si444733qkf.252.2018.07.24.03.56.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jul 2018 03:56:58 -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=XAoPvIvN; 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]:39465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuzx-0004sc-Kr for patch@linaro.org; Tue, 24 Jul 2018 06:56:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuZ-0000vi-7Z for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuY-0006Wx-H1 for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:23 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:51433) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuY-0006Wa-Am for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:22 -0400 Received: by mail-wm0-x235.google.com with SMTP id y2-v6so1446901wma.1 for ; Tue, 24 Jul 2018 03:51:21 -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=oBOyisWYvelL8YHME7eneb5/LPBvVj5hhLp7keQSuw4=; b=XAoPvIvN0zEtS3mhuEV45PdyTySqdYd7fLXC0Xy4bUKCd9co8/gTSyHyk8eVA9k2vH VpVaT15d+YgErw+cpmJbKO/koujEWoZg90PhbE9EjO3dCVOQMhtUF0uvzzKzVTaEaWVm AuS0dvU8EpekUEknDWNSyFQ4QHKTk9YO7MMaE= 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=oBOyisWYvelL8YHME7eneb5/LPBvVj5hhLp7keQSuw4=; b=luUkUn+cB5thksO3GHNfpTfxbnDdMlrini6QaMx10uEy6rzmSj82lkERe7rbzyctaz fX8pfGywy/x3cvpJOSk0SrL6oMXjZX2msx5E9WbTKq5qenq7JyEzYGkNpvsI+iJaWKvR A/pLUV9XIwg/PA+IW/XcZUeaaj5HZcNFDs8zktB4XIYzjKbey+1ucuTK4AdeKWdfaUdF U0L1oYTn0oX4O231TRUpPI9CXgYWZ0Pl6FMBlC1znWnyEoRO/x6cLD/yde4s1Lw/7yNr U3jMTUCQUNsSuBLoSXhGZEqLxXnzb7GT1vY4ky4TADI+IZHJzeDieyxaACjWID9McEY1 5k/g== X-Gm-Message-State: AOUpUlHjt9dc3UCZjVa0LuKpaZ+NdxB/r+MN3givcx6fF7FYmKzqhG7Y uVlUb7NChX1xvlYn455mWe9kzc0Vtp4= X-Received: by 2002:a1c:19c2:: with SMTP id 185-v6mr1675367wmz.79.1532429481052; Tue, 24 Jul 2018 03:51:21 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 127-v6sm1327457wmd.18.2018.07.24.03.51.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:17 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B85963E06A6; Tue, 24 Jul 2018 11:51:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 24 Jul 2018 11:51:03 +0100 Message-Id: <20180724105109.8392-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180724105109.8392-1-alex.bennee@linaro.org> References: <20180724105109.8392-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::235 Subject: [Qemu-devel] [PULL 11/17] 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: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 Tested-by: Philippe Mathieu-Daudé -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8fbb076396..05afeb64a7 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