From patchwork Tue Jul 17 19:55:47 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: 142215 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4080335ljj; Tue, 17 Jul 2018 13:08:29 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc9VW77YOsIQNTwXR+VZnkIedo1/+YOXdZALiIbqVPPrLwTFgXSSXjuBWixa8TGjsBm4cT9 X-Received: by 2002:a37:9306:: with SMTP id v6-v6mr2856070qkd.36.1531858109482; Tue, 17 Jul 2018 13:08:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531858109; cv=none; d=google.com; s=arc-20160816; b=N7Y7Nzp2DbgGv341WiEhGy1RhT35ogwiNTgLkD4mWR9Zxlfbjx/9D7yv8aAwKD5Q6a G01wzwr93/V1S6QRnEfqv0BDGmDjfKJ+VPT5DrV2qmp1Za5hzjEUUUnfUS84aVWuRlxe knfcGNvVeWh7JqVuUPblpEAXG/w7GScirUCGtFTcc4YmlDOs7T/KDOVS2su+ERCJzNdq qLXTAH2dIS8qPc1LFN6ik+V9z+K8xbGS8vwbDeYAIthuZ/Aj3JDdxxBabc0S+kU92Oay P4i2NfyD8EOsjO4pVcKBs/NStY33hL6osRc9yt8sYbXvZAary9euckLoKbCJPQKCQK0d xITg== 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=ijZLzag+tuxX50+7VFzVKtmQJvhoutHNmggbjMrVO88=; b=v1Drv7kfTfIpoZyJGSFxXeSenSg72yPgpmu7+GxMn5jlYD02oqZlI6K/1UR0SQteqc QjO6Td983e3tiZwSdKsZxjst27U1ipVAkW7j6hIOilHqteO50lib2zwXLMyVm8CEYSFt MfHJIIusqbijNBwkelWQ8coplCCCmE0jPZ0tL6YiaA26MvxcdubEYRVntASNAs+lnzuC Kv6Y3lEuEmgaoPlzF4pTIxlLy3Cyp/shecN6O5ncciK0oW/GjuXl1dphlybPJ/JKvAau d5/ojYwdZGs44dEFE5Wigy3AqKw72bjv61ktSDsxQ38No67RbZw+NZdqI/24WbSNqGJo kJyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZGfr5WDf; 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 x67-v6si1631827qka.168.2018.07.17.13.08.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 17 Jul 2018 13:08:29 -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=ZGfr5WDf; 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]:32981 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffWGq-0004H2-RX for patch@linaro.org; Tue, 17 Jul 2018 16:08:28 -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) 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-Received: by 2002:a1c:aa8f:: with SMTP id t137-v6mr2130694wme.54.1531857367058; Tue, 17 Jul 2018 12:56:07 -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) 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: 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 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_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 Tested-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.17.1 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