From nobody Tue Nov 4 22:04:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531150018917532.0539159675577; Mon, 9 Jul 2018 08:26:58 -0700 (PDT) Received: from localhost ([::1]:42767 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fcY41-0004x3-Po for importer@patchew.org; Mon, 09 Jul 2018 11:26:57 -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) 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) 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-Google-Smtp-Source: AAOMgpdRY9jv94kxB1usiYAPK7uVn6vfGV3Ezg2QRSRF7k+JWwfqill0iiizb2mMiM41XVQ+MxtKDQ== X-Received: by 2002:adf:967d:: with SMTP id c58-v6mr14794556wra.197.1531149686134; Mon, 09 Jul 2018 08:21:26 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- tests/docker/Makefile.include | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles DOCKER_DEPRECATED_IMAGES :=3D debian # we don't run tests on intermediate images (used as base by another image) -DOCKER_INTERMEDIATE_IMAGES :=3D debian8 debian9 debian8-mxe debian-ports d= ebian-sid +DOCKER_PARTIAL_IMAGES :=3D debian debian8 debian9 debian8-mxe debian-ports= debian-sid debian-bootstrap DOCKER_IMAGES :=3D $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdi= r $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -121,6 +121,11 @@ docker-image-travis: NOUSER=3D1 # Specialist build images, sometimes very limited tools docker-image-tricore-cross: docker-image-debian9 =20 +# These images may be good enough for building tests but not for test buil= ds +DOCKER_PARTIAL_IMAGES +=3D debian-alpha-cross debian-hppa-cross debian-m68= k-cross debian-sh4-cross +DOCKER_PARTIAL_IMAGES +=3D debian-sparc64-cross debian-mips64-cross debian= -riscv64-cross +DOCKER_PARTIAL_IMAGES +=3D debian-tricore-cross debian-powerpc-cross fedor= a-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-i= mage-debian-powerpc-user DOCKER_USER_IMAGES +=3D debian-powerpc-user =20 # 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) $(DOCKE= R_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ --=20 2.17.1