From patchwork Thu Sep 26 18:35:49 2019 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: 1168097 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="f/YkWvNO"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46fPCj2dnDz9sDB for ; Fri, 27 Sep 2019 04:51:29 +1000 (AEST) Received: from localhost ([::1]:42846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDYrN-00061m-Sn for incoming@patchwork.ozlabs.org; Thu, 26 Sep 2019 14:51:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42254) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDYcd-000826-Dk for qemu-devel@nongnu.org; Thu, 26 Sep 2019 14:36:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDYcb-0006bJ-Sx for qemu-devel@nongnu.org; Thu, 26 Sep 2019 14:36:11 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:46538) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDYcb-0006ZZ-Dh for qemu-devel@nongnu.org; Thu, 26 Sep 2019 14:36:09 -0400 Received: by mail-wr1-x430.google.com with SMTP id o18so3569183wrv.13 for ; Thu, 26 Sep 2019 11:36:09 -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=h0dXtH6nZm3G94iVvanK9T3aTuLi2zSYLzFd05evVoY=; b=f/YkWvNO9dk1CzxJjhEidNqpeXIST+OdFfFZOCDO+Ftu1hwYxG1CPvfoDK2MSwwq/x d/6DjcyFlNmq7Sh8jWQPXz3vYYIzDbD5fBSedatyZ69/r7DzGoMUw3XXSs/znEWPO1vn emTageEA/H+4FbYAxGFLqCFtNr9OflLZ9fZelOEokwgv6WVTlkEdGuRS74rM0/zAY5si UzGSUHLSft82prKXcP5TrRnxt4row1+H6h31+J0DbxsA+hekhlNS7xO2EJvtYUI6FhI6 Zack/jMMeCDOk6yCiNtKUUoBbLVg5ZHE0d5iBOMzbwVXCoYcPS16KcsaU2OfJqD8MXhA 23nw== 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=h0dXtH6nZm3G94iVvanK9T3aTuLi2zSYLzFd05evVoY=; b=gYwUewlU8dUHIhBLYVhzwWmOQCExl6Z+1uzq/Qny90MZFFJLXCOX6/08/jgRm9wQKo y6Dob4S/p+ND4dDSUFyM2dLuxm5YOv3ySrhazr4hjb7SF3BT0iu2U1uEP/Z5ApMaqfLQ 1DxN4eibhaISM+n5anMwZzZd1p8yf3RBlmTn5fcDhdadzgsuls79UScWy1ZwFg0oTT4y OY4I4VG7GC7Mu6LOJpw40QX3qOz6N6tPrALiVWhsDEHvqBkETaPkM+YGlOK0SV+ESBHj CUOn5atOmGv0LQa0OssBrKC20euJU/H1uGp1JaxuuvEAtTPEa0ubMXBQPWDqzt5uS9N+ nBeg== X-Gm-Message-State: APjAAAX4O3lDYE7S421z8OOCMu5o86QbpylRvYC69hcljhZoUjGZRvVe cry/MQmUuGRmSJS9nailtpr7Nw== X-Google-Smtp-Source: APXvYqxQx82sk4EXCle1OODMGMvsI+B4rMUdWSoab5hslMx2EVLgwd7V1ym3q7ET+h6kaNrjvdQuCA== X-Received: by 2002:adf:dd41:: with SMTP id u1mr4325669wrm.49.1569522968038; Thu, 26 Sep 2019 11:36:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w12sm60643wrg.47.2019.09.26.11.36.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2019 11:36:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6C58A1FFAC; Thu, 26 Sep 2019 19:35:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 24/28] docker: remove 'deprecated' image definitions Date: Thu, 26 Sep 2019 19:35:49 +0100 Message-Id: <20190926183553.13895-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190926183553.13895-1-alex.bennee@linaro.org> References: <20190926183553.13895-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::430 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , John Snow , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: John Snow There isn't a debian.dockerfile anymore, so perform some ghost-busting. Signed-off-by: John Snow Message-Id: <20190923181140.7235-4-jsnow@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Acked-by: Philippe Mathieu-Daudé diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 47ff777440..a19341e326 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -4,11 +4,10 @@ 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_PARTIAL_IMAGES := debian debian9 debian10 debian-sid +DOCKER_PARTIAL_IMAGES := debian9 debian10 debian-sid DOCKER_PARTIAL_IMAGES += debian9-mxe debian-ports debian-bootstrap -DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +DOCKER_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 @@ -158,7 +157,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_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ +$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \