From patchwork Wed May 30 11:06:50 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: 137251 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp5176564lji; Wed, 30 May 2018 04:10:27 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLI4GQ5rzW9smt931K/H+xetjOxZ2D020GdcElflaAVnXuJSqzPYTrqAWfWThfDWGpj2wiz X-Received: by 2002:a37:f59:: with SMTP id z86-v6mr1809941qkg.234.1527678627169; Wed, 30 May 2018 04:10:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527678627; cv=none; d=google.com; s=arc-20160816; b=wRkSB4YEvD4yegUuy5l79+L1mtaB2VHJYTEVSts6DkbESOsxe4hm5gcVbQzH4eqKLy 8WtlmbqNiIweptBwUx7UF+qw5+v5T3Ft6gWN8YPt1BuwQP7wdcvDRYsZOOl0OPeLCbvx 6o7dWRde5mbatWm6WSqjwklRMhJfvRdH6kvTuTj15fq89x0Mm4Nb73PnR3v5QZgxGNJ9 V7PM55jolfigEbVNmOiKz7/frhumh+egW5YDdFFfgCkcoXH1n49ibtHGILV65L9m8NYu Av9dPsZ9Sx+xKFgkn9o/vq9m33Z1rgR7b2N4o1enKv+DIKupNXvGkBhg4nl7sei7aScf BzVw== 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=pvFG+RCYl+9Dr26ptyCj5NXu8Ead0cXZtg6zt1dpjD0=; b=hKhBsUo4AkzsFBvh3VW2AOWuGVchvc1qCv+31fmpGnxMYxnxEUVZCt7vBC4RzWk6Ln Eh1g4SN8nb8EJny+mRHjnsfxiB6pHi8WxNoLv0Aq8FVrvoWj7ks/qxBkbQ1OGoMw2gm5 372tqWSDrPO9Uk7DI3NRVgi21Y0fnEj6hKapjPcSwADUPQoLdazFyxyDbf0xWQNmV/Tp FTTAszM7RMo5nz+MGwZ8cnfalCm8DrdFFMA/jdHQEHGE9rpHmpLbingxYf/gl4Mo4f63 lI4RTz+VLj/gofZQCLpx4bA20DP8mWmFZovB0iIchlBtyk7/SUjlwpeolIdJNAHUQzl2 O8BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ch9vmj7T; 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 11-v6si1794179qvj.212.2018.05.30.04.10.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 30 May 2018 04:10:27 -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=Ch9vmj7T; 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]:37613 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNyzq-0002VQ-KE for patch@linaro.org; Wed, 30 May 2018 07:10:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNywY-0008Ni-Tn for qemu-devel@nongnu.org; Wed, 30 May 2018 07:07:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNywX-0001yb-Vv for qemu-devel@nongnu.org; Wed, 30 May 2018 07:07:02 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:42434) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fNywX-0001wd-Pk for qemu-devel@nongnu.org; Wed, 30 May 2018 07:07:01 -0400 Received: by mail-wr0-x231.google.com with SMTP id w10-v6so29102655wrk.9 for ; Wed, 30 May 2018 04:07:01 -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=pvFG+RCYl+9Dr26ptyCj5NXu8Ead0cXZtg6zt1dpjD0=; b=Ch9vmj7TyyQDMUbAHQtkdre41SHjr7EXG4HAy/VxjnFviYT44G5R+ix98bYDjkL+Qi xPFmQbLXZQBYLAxQ0nN5jNX8j05NDHl/prgmk193zOaTLQekTc5AoH9+TzOaOSnGTTZI 41KKv+eJWyFK9itIH4FFxnp3nIraUnvcqYWD8= 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=pvFG+RCYl+9Dr26ptyCj5NXu8Ead0cXZtg6zt1dpjD0=; b=mDtesYhveW0y09aY+33/u2lU9KiESLH4e3s+UYbYBwyx/FcY2aKmd2h+Qxhelt0jr0 lbnN/E3lK9jY4RLJsdO/PL7RyMaG3P5weUlrmWsR/NdrSFq9/zTBe5jjnsM+R3nccXss HGJJJlS4RDrU/mHOuJiWpubwZASv8ykRxYb3D3Mkz9IZx0MWp4M16zEQ5raT/rS9SRr9 m8l30soH892v3ghG9E0tx2X/7+qjzr7r4AmPm+ZR49HLgdnf6s1Bv3NgZF1bfaaaVxe/ emIa3Ul1QIFejVw6KHtDj64LDSxlVQ4ypdmtMAEXBqVjUHIzgOm0Uh0hWsEiTlAcSV+W PUOw== X-Gm-Message-State: ALKqPwfmfyeCCdQ50+D67YZVK+oMOa2JIbKOT9v+i0JK2kT3QsR72FlG Rc7BJANt7QCCKRuytZ59h7byJtBMTQQ= X-Received: by 2002:adf:a3c3:: with SMTP id m3-v6mr1627663wrb.208.1527678420766; Wed, 30 May 2018 04:07:00 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d12-v6sm26477818wre.39.2018.05.30.04.06.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 May 2018 04:06:58 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 18EC43E06E0; Wed, 30 May 2018 12:06:56 +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, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Wed, 30 May 2018 12:06:50 +0100 Message-Id: <20180530110655.22022-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180530110655.22022-1-alex.bennee@linaro.org> References: <20180530110655.22022-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:c0c::231 Subject: [Qemu-devel] [PATCH v1 3/8] docker: do not display deprecated images in 'make docker' help 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" From: Philippe Mathieu-Daudé the 'debian' base image is deprecated since 3e11974988d8 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.17.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 50cd51a54e..31f21a43f5 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -4,7 +4,8 @@ DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles -DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))) +DOCKER_DEPRECATED_IMAGES := debian +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 DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache @@ -63,7 +64,7 @@ docker-image-debian-win64-cross: docker-image-debian8-mxe docker-image-travis: NOUSER=1 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(DOCKER_IMAGES), \ +$(foreach i,$(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) \