From patchwork Fri Jun 1 16:20:57 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: 137555 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1153629lji; Fri, 1 Jun 2018 09:30:33 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ53Pdy/b6qAxWfBjUQSFpF1xW8X/pRkYOVsm6ut9DZR8bhs+z8KwmgZ9vFgiiKZ9Fn7wvI X-Received: by 2002:a37:a3d2:: with SMTP id m201-v6mr10875223qke.121.1527870633707; Fri, 01 Jun 2018 09:30:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527870633; cv=none; d=google.com; s=arc-20160816; b=g2Vz+0bgwSdCLoNLutjeyymMK7w+8tWlHnVaN2eFv/ODxxm6ulggyZpyr4Vm2hStXq NQRwzMgyTcVZAIFbe85gjByUwhxyQX9fOGUJ69iW4pa/ixKlKuWrlkGjkTZnxr6EkZFx NwJ4pVUOtg8hu//NPQVKCXs44CQS2wLx+ykYgkB71xdpYO99BtK/hycYMoizF46cpj83 cZnUQh57rM7wAup4u+DtOuNd4wCBMKxQtYozAfQtO7M24vdBq9cR2wFSFeyLbh46z6mx ck82VDzscCsMfQae1K7oGpr34PdPLhz/lcCjvZ8wKDwlzb89ISoNFwf8HK7FrL4cP051 CaGQ== 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=W/5FuYLvXQlRx+11mRQ45O0pjjXorJt3qjj+60jMz20=; b=VkbOpK0T4DuiHPMLkxUF6nRa+Uaf73zHxvKi/mqmIjFp0mj9vvncllrGheIiEQqV3N qSSMdEOuwhkvl4KZvcJPJGhinua8MgMDpHwiwjK25UHDA1V3d3OVqUXU6RWcXcCfbGW1 11WdlEU0P0r37YQX/9DmYGHE7mf7u8BmHtNG8vxmrh4yK5tI2SWIJ0nRN23Eirg12zBq Jh+ZFIUlmzLzYlYAfy3BujF04L6T57VnhVbTp5lAY0XEY2FhPYLgl3ebtbREtcqQbFEH uB0xDqiysw6UCsuJpd1fDaMVQvbuty+/JqO2wfzT2wAPbtugeMwnUKaiC3Skkl/DfqeX +3fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=M3J9sEHq; 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 29-v6si5244351qto.253.2018.06.01.09.30.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Jun 2018 09:30:33 -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=M3J9sEHq; 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]:56573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmwj-00042v-38 for patch@linaro.org; Fri, 01 Jun 2018 12:30:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fOmnb-0005qZ-PA for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fOmna-0003nS-C7 for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:07 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:52662) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fOmna-0003ms-5r for qemu-devel@nongnu.org; Fri, 01 Jun 2018 12:21:06 -0400 Received: by mail-wm0-x231.google.com with SMTP id 18-v6so4074659wml.2 for ; Fri, 01 Jun 2018 09:21:06 -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=W/5FuYLvXQlRx+11mRQ45O0pjjXorJt3qjj+60jMz20=; b=M3J9sEHqoA/owB5rz+bl3v/UjvxBIWjB1z8yI1oRESsssQO8o4tBmsi7Q46JHANgpy WvKIMxQunJh9pmev5SonlxVEtDiMDIu3fc0C7qsOHclQQ+u58lJXLvt4wcVwjuUum3US 50kMM8dZ9oOAzk+AFnE2frW+sWHJEdO0AO1DU= 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=W/5FuYLvXQlRx+11mRQ45O0pjjXorJt3qjj+60jMz20=; b=c/g+eGm3T5CBbtswqmn/Q4afcKuhi573DR9s0VTGQ9kCbctMJO0riiedcrJK65sGu6 GVq4dl0TAQJchE5RWxkxkyWJdnbpBAd2wl+eU3rmseJW09nqdRQdVr68ImFb1yNzc6JC eOkkCxmt+610PKCPSGIKadauKfNAzb48g8CMiKj5t7pL28wAW6f+5zMd0E14unX4po/X bheG6u2dF6aqwYfLcGdgc8CnTeSXKOR7XGgfMNhatPqYJWhL56Vpc6j8mLcdOPQqMi7Q VjIli0vqHU7NGJZlIp/FLFnIQWSOe4AlTtsSj3zIMtdJE6mRkXzWkSotZHEHyy384C3u FQvA== X-Gm-Message-State: APt69E2nfiOQZgOMrQJKG1Ma+z0kXZKc1leJUF2qPY8YbtI8SYTofUBl B03JNNuwxJ8BgPbtwyNiNNMfuw== X-Received: by 2002:a1c:9595:: with SMTP id x143-v6mr3350820wmd.146.1527870065127; Fri, 01 Jun 2018 09:21:05 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l69-v6sm3520225wmb.30.2018.06.01.09.21.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jun 2018 09:21:04 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 137273E06E0; Fri, 1 Jun 2018 17:21:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 1 Jun 2018 17:20:57 +0100 Message-Id: <20180601162101.895-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180601162101.895-1-alex.bennee@linaro.org> References: <20180601162101.895-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:c09::231 Subject: [Qemu-devel] [PULL 3/7] 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: 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" From: Philippe Mathieu-Daudé the 'debian' base image is deprecated since 3e11974988d8 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée -- 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) \