From patchwork Fri Jul 13 12:17:33 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: 141876 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp741638ljj; Fri, 13 Jul 2018 05:28:59 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfs1eLinEMVs71UVREPKMn4nqlPtOPc/ovgoUAVz0d22ANhiTZMj7IpH1p0ntFJy32SDSZh X-Received: by 2002:a0c:a991:: with SMTP id a17-v6mr6751110qvb.83.1531484939401; Fri, 13 Jul 2018 05:28:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531484939; cv=none; d=google.com; s=arc-20160816; b=UfNeY/AuBH1YgKLxk2AKSus1KG3nj1uXzax8Iee2pPNbcf7KbYRGaSU0YTwsoVUkjB 9zAhs3AXlMqdmCeZS3XVAIsG4myYoPtRlBjPDxYwCyaVFM04raDqdSW6wn+C0VWm0l95 Z1gMBgreVbQDtc9oCnl9cVpd66+PA4X7TQCoaHY1Qiq2SsuDGoql81vKXxg7awEfNzRD RAfck83yJb+V94jp2jVn1DMtrNA80fte8SL2MQEtS/7MILDO4YDX1b7LAZGYO4SpQitI nGrk/e00/jnTL8kidu8zv2jNCb9T0D05eSt7JIUbMewECUFp0hHmf6hF/BAWvpe9POd9 s7ew== 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=s1tjMEdyx3m/WM9lUdoC7txnYwG7NnrJqQuuANHk608=; b=NbcnMf3xJr+x8Vn6+x6lUCOSIBGSTzYjFaJGTNcc0xsjLBISRjCLPVgmH5pT8yKJru 7X/prAyU6eccjIx+OVmX4KCfPlFGyQ5sRg7h+4VNalKB+TuywhR/Kh7c+9WNdv9UE1Vy QDzvxf9z36znA06JaUiYkz5cictbEt28sSvrgXbr1oaOILBS6wzf30zPwZlcFGprAe2U zIsNSW89xrL7SNwT/DURP4OAD4ExmHGmk3nV1T1S4GApp/euOE5OwT6UTk/W/S0P/qYm 7d+1O7VN1qKb6lf/MUJQMJ6G2QZ7DpXM/JXipgXr8OIHz6dmtlSAZsmeZl8kxECRIjG6 KgiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DuCylhlt; 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 s67-v6si812624qkc.311.2018.07.13.05.28.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 13 Jul 2018 05:28:59 -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=DuCylhlt; 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]:37025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdxBy-0004fj-RA for patch@linaro.org; Fri, 13 Jul 2018 08:28:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdx1D-0004mT-Qc for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdx1C-0003lc-NF for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:51 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:38888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdx1C-0003k4-HA for qemu-devel@nongnu.org; Fri, 13 Jul 2018 08:17:50 -0400 Received: by mail-wr1-x42e.google.com with SMTP id m1-v6so12189585wrg.5 for ; Fri, 13 Jul 2018 05:17:50 -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=s1tjMEdyx3m/WM9lUdoC7txnYwG7NnrJqQuuANHk608=; b=DuCylhltaJfiWAPf8M8X+UZknOlC0QZAhhI8b4YKhznY1Er9nafTccMJ7Ux89A7vre 1LajoWmSRrabcp0Vr/4E3a6u3BIIoqPdv9scutwQ+8kiHJsnHW51CVqFMVgHztxBoG2S iuP3iN/XGQof2jOux3oW3D9Kq3uQAXQ7Qmo60= 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=s1tjMEdyx3m/WM9lUdoC7txnYwG7NnrJqQuuANHk608=; b=pwF4Qr3uyuIUF7UwbT0fyQ5pNKnW2YCwGaVfx9QicjyuijtseytAKblk9McQDP5Vl6 SgY8BMbPHfnNDuUzoM0SL3Ys6ZUuvk6af1xA2MOO6BvavaMLFfiE6op1bIG35ijImEKE 9/UsXtUrjbmPz0D032Nl/kt+gT9VQ6L+7EdkfP4+xd5joPd5Npu1lhr8zM/cWtrCVcIc ok7iBouzulgJbWJaQgDoxj5Az2igG8a4BR7P4jm3y0LTZijnu8ou0DLmG1+MYg5kPhgo L7IzF0EWa+y+ewj/ZmSKBe2WVi/mpvZF5z+HU4A/G2XQjwB1r4bruxG3ca+lpZmYu0/u rjKg== X-Gm-Message-State: AOUpUlH5IzfwrhT/0kMx5OVriWzRL7dFxlNMYTWNkubcBaVvO7zabr3v X4/GI1Q7MzMNDLDXHdqA+5YtNg== X-Received: by 2002:adf:f091:: with SMTP id n17-v6mr5044823wro.49.1531484269622; Fri, 13 Jul 2018 05:17:49 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y127-v6sm9760906wmy.1.2018.07.13.05.17.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 13 Jul 2018 05:17:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 8DB7A3E0775; 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:33 +0100 Message-Id: <20180713121741.19262-9-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:4864:20::42e Subject: [Qemu-devel] [PATCH v2 for 3.0 08/16] docker: Makefile.include don't include partial images 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" Rename DOCKER_INTERMEDIATE_IMAGES to DOCKER_PARTIAL_IMAGES and add the incomplete cross compiler images that can build tests but can't build QEMU itself. We also add debian, debian-bootstrap and the tricode images to the list. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b2a7e761cc..09fb7db7fa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,7 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) -DOCKER_INTERMEDIATE_IMAGES := debian8 debian9 debian8-mxe debian-ports debian-sid +DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian8-mxe debian-ports debian-sid debian-bootstrap DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -121,6 +121,11 @@ docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 +# These images may be good enough for building tests but not for test builds +DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross +DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross +DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross + # Rules for building linux-user powered images # # These are slower than using native cross compiler setups but can @@ -137,7 +142,7 @@ docker-image-debian-powerpc-user-cross: docker-binfmt-image-debian-powerpc-user DOCKER_USER_IMAGES += debian-powerpc-user # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(filter-out $(DOCKER_INTERMEDIATE_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ +$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \