From patchwork Tue Jul 24 10:51:00 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: 142755 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp7118223ljj; Tue, 24 Jul 2018 03:56:52 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdlYK9bAEWl/ls0U9nIDrMauHn3UvG+lli3jOWgki14s+s5851l21P/P0+0m5zyWZcOoIAl X-Received: by 2002:a0c:d0e3:: with SMTP id b32-v6mr14326277qvh.236.1532429812289; Tue, 24 Jul 2018 03:56:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532429812; cv=none; d=google.com; s=arc-20160816; b=WTcBfPrlTAgl4Lv/jOov+INlraQxRP7cXPj4Xscb2tHf2KPihO6VWdNmkPhkd60Qux uB+ZAaiJ+ahUAotYULAFg91LaiCe1RYY1CUPoUBf6oBZLFDvan8+bEM/u0Yx9pCTThro nOOZt9CJPsD4QJVeeLBlcnwmnXojHYijXjNBVNC6Aq8yyNbwRyOUpwubheTUD3vz/9co beH2hzV5dM8+I4M733j/vDknUUhG8PK67qPFyCuQHybDEUxsqZFwS5MpRezLbaTG+Yk5 YoVPmkjcqqNd+9hEw67kpMTcLxYbfpIkD1pT+/OykTAN/r3X9lL1o6cUB33uayDLLHjZ ATXA== 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=SKBNE8s5kJLF934/FXOlELkPz95G61BlqHCY4RHu/2M=; b=MNgI4SU08pJb8v5e+KTkuuJFyzpIKwhw3Pc/ZrfjUSQl0Uf+wlZBklEPNpf/fzV1E6 p2tD4DzdYhcZbn9yu9Xtr2HV0ptxA+sC2EcsBg3Qs+WJAd9xs+ug0jUTJmbl8a/10cFw gUNOhRURH5gJQTuiOhnGOqdUlbC0qQ4hrAfmxOr3ACzQSIejdZrLwnmWN+gcs8FOXRN5 rilM9QWCIihfX3+KgqAf0uVhPPxmjT4tPmZAMvKd7htrA34sfYFcRsgtpVaTGvOpQGAW EZwnXMTsM+9b2k3k4+F4ugPogViB4GvTVmPjd+fmHfDtzYgT5jv8z7+fpNgY/QJ6ZuiQ KXgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FV7l1n78; 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 s15-v6si11093932qks.9.2018.07.24.03.56.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 24 Jul 2018 03:56:52 -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=FV7l1n78; 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]:39464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuzr-0004mB-KA for patch@linaro.org; Tue, 24 Jul 2018 06:56:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhuuY-0000up-7d for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhuuW-0006VX-Vw for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:22 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:37466) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhuuW-0006UQ-Po for qemu-devel@nongnu.org; Tue, 24 Jul 2018 06:51:20 -0400 Received: by mail-wr1-x435.google.com with SMTP id q10-v6so3663647wrd.4 for ; Tue, 24 Jul 2018 03:51:20 -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=SKBNE8s5kJLF934/FXOlELkPz95G61BlqHCY4RHu/2M=; b=FV7l1n78Gtdp9XqG9xIXZqBAXCZlNwRIwmoiKfFpeRIok7Ju7R5ggJ7v6b4GiKb5y2 50P91GhBcAOdjHW79knhcs199x7hbRttgBMHLTTS5Et/kGnhKsr7khiaMieOtAAbExER QLrKjvZ6+8KN/izwWKprDz+tLm5Dcpp6DU4Rw= 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=SKBNE8s5kJLF934/FXOlELkPz95G61BlqHCY4RHu/2M=; b=gzTIg4EM4PWSlVH2j76w9DPaJ4yuw9pP2ezWgXgT0l75YmxdjnFiznoXvLRaezv5GB 6rId3lvu3HoJFexQtVyuDwVJhzYqi9fUQDSQvtSVWv2xD/NJwMZHANiV/6QJzWZ/dxx8 qE40DDTFKsGdcepXKxtjHnuk0jmsqO+tJIkTsimTqr+Z/w+9F43A/gJj43U/bu28End3 KCKb5k/zntRfEjfjH1LkAG0ctW9DwcHD7Xn2XTcZzDXaDls9iG0cU6Ha2gBJLE5X5H6P JhWUc0qeFcJECVSEFN3/3ibjwMiFus5DkCOHBOpG1seQG3Tnx+C9Fi4UgFgSOBe0DVQ1 m+iQ== X-Gm-Message-State: AOUpUlFDKb8I9hhXo2qSFU4P3uBaME55e+12ZVZaO/Am42A4SLiC4JcF v3AiyQ2Cp1KYLhALcvTyAzaDrQ== X-Received: by 2002:adf:c109:: with SMTP id r9-v6mr11630462wre.233.1532429479632; Tue, 24 Jul 2018 03:51:19 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m10-v6sm12613194wrj.35.2018.07.24.03.51.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jul 2018 03:51:16 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 810963E0684; 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:00 +0100 Message-Id: <20180724105109.8392-9-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:4864:20::435 Subject: [Qemu-devel] [PULL 08/17] 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: 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" 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 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) \