From patchwork Mon Jul 9 15:21:14 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: 141433 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2798563ljj; Mon, 9 Jul 2018 08:27:35 -0700 (PDT) X-Google-Smtp-Source: AAOMgpes5rEymydNK/MPSPGqODKRsww8EL2U6OGy7D+PGHrd8TU5VKXfcA774WvP6iJPLa+WHmIb X-Received: by 2002:a37:3ca:: with SMTP id 193-v6mr11268760qkd.363.1531150055419; Mon, 09 Jul 2018 08:27:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531150055; cv=none; d=google.com; s=arc-20160816; b=Zcv5qDMoVkij8+teQOEH2D+VtitcFjHcDrphhH2u5WLbzkdiTFGKaKj6zp7TxZt+DJ C46r5U9+98HsyPb+ufuhnsd//vAcTl15M9SGPBTwbhxKgK6oMDVdtcNqwa8csAedLye+ udecHJbl3e+sAvEr/45H/JfXuH2HjB45mHAAYOCHRyW7RAsvzE9SAGMhDxKQRXwjZqWO Nt887Bn1d3y6Gyt2cZc0migDR0szfb53u2/+xzawal9mAi45/tYm03HvJFWdb+I4DjHs avAb5AU/Bc0jTOmjm82YuJXEdtZAMJAOuoSVAl1rFcA3LUa52Za6ZO/04TmosvETLa47 h6Qg== 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=eoyy3Wy3Mc5dV4JmhofWEk82dgPmWbPSQUVZEWqTswgJcRMEKTPqqOyJHgqh/ctnIM fbmXgYSGocg8fV7nBCeP5adMm7fF6jKhursoWm1BLas1Rhp2OZKhuNSkW4TjXdxH7/nG /RCEvWdKMzh9F0pBZzH71MGWT/GojpgpfPB2lPI2rec84CV8QD06gqu0gIFEswNLepaI 2mRIDY21/4qZLsxMDTj9td6mq/JIGcvUJT8SRvmZT2lqP3Lmwsyi+rMISzqnSW8F9tx1 35HNDK9c8AAvc4GB4+q9wlPk7Jxo3r3RhX/HRZoH64f/5ZKzpXOmfVsEwZRs/txcGMp3 F6vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DUx2GIwp; 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 o5-v6si11236542qti.383.2018.07.09.08.27.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 09 Jul 2018 08:27:35 -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=DUx2GIwp; 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]:42767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcY4c-0004x3-Ol for patch@linaro.org; Mon, 09 Jul 2018 11:27:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcXyi-0000pH-8m for qemu-devel@nongnu.org; Mon, 09 Jul 2018 11:21:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fcXyh-0005Xh-Bp for qemu-devel@nongnu.org; Mon, 09 Jul 2018 11:21:28 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43166) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fcXyh-0005XN-4i for qemu-devel@nongnu.org; Mon, 09 Jul 2018 11:21:27 -0400 Received: by mail-wr1-x431.google.com with SMTP id b15-v6so11419664wrv.10 for ; Mon, 09 Jul 2018 08:21:27 -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=DUx2GIwptwl++sSQ7UlVM99WnZtHm3PXV4YeHkSAeLvDoPk+L1bWpcdZosYjbq0K6A uhTv9G8frRnD2qpJ1e8ChHCYPmpuEYQ23RJcvbHfitIg7FwNCg2DogoQ+ipnokLN0LR9 AO01gGf3R0mQJ9ihnwt4xukU3Nkqt+XZ4eM/g= 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=bP9JCh6BdkZ3POCdtStazQiGyAE1k0MYnQXs+fm0jeGK1Oo3GNmjev2inj6KWibbe0 /86iGpKL8G2Qn2CUP0stcyJXOwdTe9LUnY0z3aFfAfHyCMeJnz7TqfTZ+dVBloMMc0ca wdB5pgDAED9W9VCQfhErEzTl5wiwwtgxxr6a+eLamL+KYGBQNfB6djXurR9BYJuq0X2Q Vi6cQAahmBalni7H2CWts5I/qg8/cADXwvt7H0uOYWH6ZC2/x2iv+NfDjVg+L/IPnOyl 9EaemULH6j8mRBM+MFpHxobzw6c6Qmvl/bdGBokDKwbLzwAvMP8lbZyYL5rWV2rOblQw r85g== X-Gm-Message-State: APt69E19B7ZdzVpro8HK6UW/Dk0jnEMaixV0ArBy+E22hEHrqmng44kL OERLP55pEuiHuBK3a1+v98dHjQ== X-Received: by 2002:adf:967d:: with SMTP id c58-v6mr14794556wra.197.1531149686134; Mon, 09 Jul 2018 08:21:26 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k36-v6sm19710626wrk.93.2018.07.09.08.21.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Jul 2018 08:21:24 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6FDE23E07D1; Mon, 9 Jul 2018 16:21:18 +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: Mon, 9 Jul 2018 16:21:14 +0100 Message-Id: <20180709152117.21585-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180709152117.21585-1-alex.bennee@linaro.org> References: <20180709152117.21585-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::431 Subject: [Qemu-devel] [PATCH for 3.0 07/10] 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 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) \