From nobody Mon Apr 29 12:25:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569262546; cv=none; d=zoho.com; s=zohoarc; b=iEedaIpIe1gj5rWKldCYyq2cAwPLecadzwLG0AK8G1GBSy5hKoHGfoP7trSwRfv0UzQs7wzhe9HRGaoDSbHHBkRTXP+X1UBlWb+XxkPnGJcFaPwkX8fpp5Gcl7CaYemG56swFLnVlL3P6UBte7fFVVW71crdJ/qGa3HKtSCXQYw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569262546; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=4y6JVcxVIPgMNlhvJaL8Y2g8c7ywPJSlkwLDPiUXVzI=; b=Lx/CQMbS9d9UKXnSW+T0LsnFdFL0NKKG0R1ofKb3CaTDpDpfGgaRcvlO48gmCj4AmlNvoc2t3GP8pSQdjaSYPhl9TWXonlEr2Gy+d30ez70CwXhK+jJteVb0Lvy9EeeK8eEfg/PiWsDOSwrpL4kDMfBZ8GCRmc06o8LCcfCRROA= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569262546711518.8826456033671; Mon, 23 Sep 2019 11:15:46 -0700 (PDT) Received: from localhost ([::1]:60638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSsC-0004pi-Tn for importer@patchew.org; Mon, 23 Sep 2019 14:15:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47342) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSoP-0000th-Lk for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCSoO-0000kD-Ab for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCSoO-0000iV-25 for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:48 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2ABED89810E; Mon, 23 Sep 2019 18:11:47 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 886E51001B00; Mon, 23 Sep 2019 18:11:46 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3 1/6] docker: remove debian8-mxe definitions Date: Mon, 23 Sep 2019 14:11:35 -0400 Message-Id: <20190923181140.7235-2-jsnow@redhat.com> In-Reply-To: <20190923181140.7235-1-jsnow@redhat.com> References: <20190923181140.7235-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Mon, 23 Sep 2019 18:11:47 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 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=20Benn=C3=A9e?= , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" We don't have a debian8-mxe dockerfile anymore. Fixes: 67bd36beda1ae Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index d796f71b63..485de7f59d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -7,7 +7,7 @@ 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_PARTIAL_IMAGES :=3D debian debian8 debian9 debian10 debian-sid -DOCKER_PARTIAL_IMAGES +=3D debian8-mxe debian9-mxe debian-ports debian-boo= tstrap +DOCKER_PARTIAL_IMAGES +=3D debian9-mxe debian-ports 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 --=20 2.21.0 From nobody Mon Apr 29 12:25:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569262763; cv=none; d=zoho.com; s=zohoarc; b=bPjDPd/BkWj3QDUQMzJsxtG8rTzxcJVBmFQOCTbxYhDs6mDf3Ax/kYLli2pgZ0zISJXKMgforLR9yCap7SchXIWZQlJatqqD7JAwAAz3SKvkSt28mpohMIwXJ5O0bOtq3PXsjJ851uHlbS/QX1gsOn1YWzUg5qX8OtZCAYd28VA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569262763; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=cymC5UwF+nQdBAjZAmOHzSz41jJEKm5OPY0kYvLhzL8=; b=d4r1qa4tnmTYsm+AWRgVbBoVHarYUDmya5YMxgVf+j/K96DnQmKEjaVg4BIXDBODxAk2+ro4LwUF7awK8q0KhzHC4Wd5HmcFSrBVxCtN/3D8KeIdVKiddAPdbXlIiaeWnVmZkBBQ42j/rCXHv6+KXq++XXqlnVKn0w+egoXJLiE= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569262763266168.59609325676138; Mon, 23 Sep 2019 11:19:23 -0700 (PDT) Received: from localhost ([::1]:60668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSvg-0007Hh-2P for importer@patchew.org; Mon, 23 Sep 2019 14:19:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47360) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSoQ-0000tj-FQ for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCSoP-0000lW-3C for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49296) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCSoO-0000jf-Nh for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:48 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E5C81898114; Mon, 23 Sep 2019 18:11:47 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4BE781001B00; Mon, 23 Sep 2019 18:11:47 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3 2/6] docker: removed unused debian8 partial image Date: Mon, 23 Sep 2019 14:11:36 -0400 Message-Id: <20190923181140.7235-3-jsnow@redhat.com> In-Reply-To: <20190923181140.7235-1-jsnow@redhat.com> References: <20190923181140.7235-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Mon, 23 Sep 2019 18:11:47 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 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=20Benn=C3=A9e?= , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" debian8 partial base is also not consumed by any image, so remove it. For QEMU's development cycle, we only support debian9 (stretch) and debian10 (buster). Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian8.docker | 34 ------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian8.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 485de7f59d..b20a810016 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_PARTIAL_IMAGES :=3D debian debian8 debian9 debian10 debian-sid +DOCKER_PARTIAL_IMAGES :=3D debian debian9 debian10 debian-sid DOCKER_PARTIAL_IMAGES +=3D debian9-mxe debian-ports 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)) diff --git a/tests/docker/dockerfiles/debian8.docker b/tests/docker/dockerf= iles/debian8.docker deleted file mode 100644 index 1212a85c35..0000000000 --- a/tests/docker/dockerfiles/debian8.docker +++ /dev/null @@ -1,34 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target is builds on Debian and Emdebian's cross compiler tar= gets -# to build distro with a selection of cross compilers for building test bi= naries. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM debian:jessie-slim - -MAINTAINER Philippe Mathieu-Daud=C3=A9 - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list - -# Setup some basic tools we need -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive apt-get install -yy eatmydata && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - bison \ - binutils-multiarch \ - build-essential \ - ca-certificates \ - clang \ - curl \ - flex \ - gettext \ - git \ - gnupg \ - pkg-config \ - python-minimal - --=20 2.21.0 From nobody Mon Apr 29 12:25:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569262395; cv=none; d=zoho.com; s=zohoarc; b=lN4y+jJOM2ZbcirXrHPrClRw/OcvPPkQ6e8q+GxHAFQ/nEIYTpZZHAaBFDWcyx3OlutZwVT60/nLISzrZ2uOisLVk7KfXoi03ppgf1Bj1aFUosMqUBA8eccQTyCiBYfnVXu1Hv2umLJdSJ+8ovuP+pcOnqj/H37MEN9Ydtg2MT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569262395; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8xiGIt8Q9CNpsf0E8VcjRBvBwBHT550XLfAjdK1E+EQ=; b=UNEYNcOybsUERW1mAzLc0vsJO96N9bg3T1jJQYXkX0ymP++/pXEx3wCnh35l761Z+fIPVKZ9Vkkepp7WurHYCgdcl7kQgZhwGCXRH/zMnwFLxjPEtdlnQB5K06jlqG43sqnU0Ia5ZfLWH7FaHNT7oCUR7bpcjyRA5lychKih6xs= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569262395125438.31964123025216; Mon, 23 Sep 2019 11:13:15 -0700 (PDT) Received: from localhost ([::1]:60614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSpl-0001sj-DZ for importer@patchew.org; Mon, 23 Sep 2019 14:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47365) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSoR-0000ts-8P for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCSoP-0000mp-MT for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34814) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCSoP-0000lI-EM for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:49 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A74FF3004E5B; Mon, 23 Sep 2019 18:11:48 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 107671001938; Mon, 23 Sep 2019 18:11:47 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3 3/6] docker: remove 'deprecated' image definitions Date: Mon, 23 Sep 2019 14:11:37 -0400 Message-Id: <20190923181140.7235-4-jsnow@redhat.com> In-Reply-To: <20190923181140.7235-1-jsnow@redhat.com> References: <20190923181140.7235-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 23 Sep 2019 18:11:48 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 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=20Benn=C3=A9e?= , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" There isn't a debian.dockerfile anymore, so perform some ghost-busting. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b20a810016..983224ad96 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -4,11 +4,10 @@ =20 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_PARTIAL_IMAGES :=3D debian debian9 debian10 debian-sid +DOCKER_PARTIAL_IMAGES :=3D debian9 debian10 debian-sid DOCKER_PARTIAL_IMAGES +=3D debian9-mxe debian-ports debian-bootstrap -DOCKER_IMAGES :=3D $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdi= r $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +DOCKER_IMAGES :=3D $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DI= R)/*.docker)))) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR :=3D $$HOME/.cache/qemu-docker-ccache @@ -159,7 +158,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_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKE= R_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) \ --=20 2.21.0 From nobody Mon Apr 29 12:25:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569262575; cv=none; d=zoho.com; s=zohoarc; b=hQkUmAvHh5PBNsI0DGADJDiOQJc8AQ8aaYG9h+H1PDNzN0aWmYRvmAgTaW4RkiS/YylXKxJFpBOooW+BpCydnDD5dc83qfjBUVrMLJYTU9LR6bGmSmLOjbeCRkt45KZKEoVWPrDOMQjfFbP0KqnvHc6Ipg5bAkNZyrGeNIRDT2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569262575; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Dq/f/XZKfKeOcjvoGd+ThzzOQIfBBTl+m5g7vopUwP0=; b=j2O6KEVmskaRFwamZcsvD3LDLMB0ggt8NcV4WrkJvDkeiMqIKHueAURB9wHvLfLeiilFgXSeOFYWQkHqkn0ucZnWTW7H1xfZ3KSRuZ9GTo8AsO8hvKVegaVwp0QjmDs8aFPyIlq0MMygXkGK3x0wc8MixWcKtU8WBLj27o+vIG8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569262575899367.57443231028606; Mon, 23 Sep 2019 11:16:15 -0700 (PDT) Received: from localhost ([::1]:60640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSsZ-0004ub-8j for importer@patchew.org; Mon, 23 Sep 2019 14:16:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47393) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSoS-0000uB-EQ for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCSoQ-0000n6-DC for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43594) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCSoQ-0000mh-6D for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6DE8A3175281; Mon, 23 Sep 2019 18:11:49 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id C8B1F1001938; Mon, 23 Sep 2019 18:11:48 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3 4/6] docker: remove unused debian-ports Date: Mon, 23 Sep 2019 14:11:38 -0400 Message-Id: <20190923181140.7235-5-jsnow@redhat.com> In-Reply-To: <20190923181140.7235-1-jsnow@redhat.com> References: <20190923181140.7235-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Mon, 23 Sep 2019 18:11:49 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 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=20Benn=C3=A9e?= , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" debian-ports is listed as a partial image, so we cannot run tests against i= t. Since it isn't used by any other testable image, remove it for now as it is prone to bitrot. Signed-off-by: John Snow Acked-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-ports.docker | 36 -------------------- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-ports.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 983224ad96..7bcd97101e 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 # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian9 debian10 debian-sid -DOCKER_PARTIAL_IMAGES +=3D debian9-mxe debian-ports debian-bootstrap +DOCKER_PARTIAL_IMAGES +=3D debian9-mxe debian-bootstrap DOCKER_IMAGES :=3D $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DI= R)/*.docker)))) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds diff --git a/tests/docker/dockerfiles/debian-ports.docker b/tests/docker/do= ckerfiles/debian-ports.docker deleted file mode 100644 index 61bc3f2993..0000000000 --- a/tests/docker/dockerfiles/debian-ports.docker +++ /dev/null @@ -1,36 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target is builds on Debian Ports cross compiler targets -# to build distro with a selection of cross compilers for building test bi= naries. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM debian:unstable - -MAINTAINER Philippe Mathieu-Daud=C3=A9 - -RUN echo "deb [arch=3Damd64] http://deb.debian.org/debian unstable main" >= /etc/apt/sources.list - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed -ne "s/^deb\ \(\[.*\]\ \)\?\(.*\)/deb-= src \2/p" >> /etc/apt/sources.list - -# Setup some basic tools we need -RUN apt-get update && \ - DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt-get install -y --no-install-recommends \ - bison \ - build-essential \ - ca-certificates \ - clang \ - debian-ports-archive-keyring \ - flex \ - gettext \ - git \ - pkg-config \ - psmisc \ - python \ - texinfo \ - $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) --=20 2.21.0 From nobody Mon Apr 29 12:25:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569262777; cv=none; d=zoho.com; s=zohoarc; b=cIyCMXrlwSVmXSI60UP33xpbAD5ZJWP2uovh0pVYkq7ytAFLcSa2JJX/NUdNN9gMH0ZKG2xwb9j6VCKetWih7f8YZpWM3HBg39RDGHGLodDjqVv9Y/yMtIImJCknrJRvXtUQf2Y17hhWjVuEcdfvZ/lnwk2jGolGPgtnsiJENH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569262777; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=i+OVBe0Q/s9FQ+jwK0yRg0K6YGbWWOFooCtkm2vJ/u0=; b=Rn53nOXc8YPGb+CPxjTmN+pwI4TktTo9LX1U7eGjQttILyhmvsD4BiJ/CdGxTRvXekwqV9qVvgVP9ueTytXEXO8WN+aWqzpzKyt+0fBwdZdr7RZJcCJVCHhgkjAFX8TnzZvEEqaQlkCh/VXSyIlsPCjqHnflREHLhUo9jdRxtgc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569262777928213.08205532601994; Mon, 23 Sep 2019 11:19:37 -0700 (PDT) Received: from localhost ([::1]:60676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSvv-0007b0-Bk for importer@patchew.org; Mon, 23 Sep 2019 14:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47402) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSoT-0000v1-87 for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCSoR-0000pD-GQ for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56666) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCSoR-0000n3-6h for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 331743058359; Mon, 23 Sep 2019 18:11:50 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E7981001B00; Mon, 23 Sep 2019 18:11:49 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3 5/6] docker: remove unused debian-sid Date: Mon, 23 Sep 2019 14:11:39 -0400 Message-Id: <20190923181140.7235-6-jsnow@redhat.com> In-Reply-To: <20190923181140.7235-1-jsnow@redhat.com> References: <20190923181140.7235-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 23 Sep 2019 18:11:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 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=20Benn=C3=A9e?= , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" debian-sid is listed as a partial image, so we cannot run tests against it. Since it isn't used by any other testable image, remove it for now as it is prone to bitrot. Signed-off-by: John Snow Acked-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-sid.docker | 35 ---------------------- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian-sid.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7bcd97101e..d7b1082b5b 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,7 +5,7 @@ DOCKER_SUFFIX :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES :=3D debian9 debian10 debian-sid +DOCKER_PARTIAL_IMAGES :=3D debian9 debian10 DOCKER_PARTIAL_IMAGES +=3D debian9-mxe debian-bootstrap DOCKER_IMAGES :=3D $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DI= R)/*.docker)))) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dock= erfiles/debian-sid.docker deleted file mode 100644 index 2a1bcc33b2..0000000000 --- a/tests/docker/dockerfiles/debian-sid.docker +++ /dev/null @@ -1,35 +0,0 @@ -# -# Debian Sid Base -# -# Currently we can build all our guests with cross-compilers in the -# latest Debian release (Buster). However new compilers will first -# arrive in Sid. However Sid is a rolling distro which may be broken -# at any particular time. To try and mitigate this we use Debian's -# snapshot archive which provides a "stable" view of what state Sid -# was in. -# - -# This must be earlier than the snapshot date we are aiming for -FROM debian:sid-20190812-slim - - # Use a snapshot known to work (see http://snapshot.debian.org/#Usage) -ENV DEBIAN_SNAPSHOT_DATE "20190820" -RUN sed -i "s%^deb \(https\?://\)deb.debian.org/debian/\? \(.*\)%deb [chec= k-valid-until=3Dno] \1snapshot.debian.org/archive/debian/${DEBIAN_SNAPSHOT_= DATE} \2%" /etc/apt/sources.list - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ - bison \ - build-essential \ - ca-certificates \ - flex \ - git \ - pkg-config \ - psmisc \ - python \ - texinfo || { echo "Failed to build - see debian-sid.docker notes";= exit 1; } --=20 2.21.0 From nobody Mon Apr 29 12:25:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569262956; cv=none; d=zoho.com; s=zohoarc; b=jKn6pez1oLKqIcP/pXS01X/zW9KLIeBgYcRfHSLzQ4yCEdQopJxHx0A5vG3b3B4PS6I9rWu1S8PVHDEDuVZH9GhUbOS30m3Ev4TqyVuheLJvoykc/M/cI2eU88YPj5K/E/Gl0orUa+PawWzZdKvyO7ve/oGANM7ezTdNXsYtTf8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569262956; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=WhqBWRBZsbvQr46E2mwbxEIjcnfr2SqKCoyWoW3zp5g=; b=NmcHQ3DW9IulITMGzKg5Q+6LkhSE1MQtjAiT3vX2hkMmbeX0ETaw1WZDEKUKkEzns/inQRBr7N45DgTFAeZt+Wg3H2+PbMONHQmWiX2q72LJ2mf6NRRmlBbiHZCePZ37dbS0uR2dQwcgD7Kz+4CK/lS+YH056Bmo0kvYlYXqSwU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569262956274302.49453926939657; Mon, 23 Sep 2019 11:22:36 -0700 (PDT) Received: from localhost ([::1]:60708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSyk-0001qV-6a for importer@patchew.org; Mon, 23 Sep 2019 14:22:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47423) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCSoU-0000w5-4a for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCSoS-0000qv-8c for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44216) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iCSoR-0000oU-Qg for qemu-devel@nongnu.org; Mon, 23 Sep 2019 14:11:52 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB90C18CB8EB; Mon, 23 Sep 2019 18:11:50 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53B5C1001B00; Mon, 23 Sep 2019 18:11:50 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3 6/6] docker: move tests from python2 to python3 Date: Mon, 23 Sep 2019 14:11:40 -0400 Message-Id: <20190923181140.7235-7-jsnow@redhat.com> In-Reply-To: <20190923181140.7235-1-jsnow@redhat.com> References: <20190923181140.7235-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Mon, 23 Sep 2019 18:11:51 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 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=20Benn=C3=A9e?= , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" As part of the push to drop python2 support, replace any explicit python2 dependencies with python3 versions. For centos, python2 still exists as an implicit dependency, but by adding python3 we will be able to build even if the configure script begins to require python 3.5+. Tested with centos7, fedora, ubuntu, ubuntu1804, and debian 9 (amd64). Tested under a custom configure script that requires Python 3.5+. the travis dockerfile is also moved to using python3, which was tested by running `make docker-test-build@travis`, which I hope is sufficient. Signed-off-by: John Snow Reviewed-by: Cleber Rosa Reviewed-by: Eduardo Habkost Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Cleber Rosa --- tests/docker/dockerfiles/centos7.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian9.docker | 2 +- tests/docker/dockerfiles/travis.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerf= iles/centos7.docker index e0b9d7dbe9..953637065c 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -25,6 +25,7 @@ ENV PACKAGES \ nettle-devel \ perl-Test-Harness \ pixman-devel \ + python3 \ SDL-devel \ spice-glib-devel \ spice-server-devel \ @@ -34,4 +35,3 @@ ENV PACKAGES \ zlib-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt - diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/do= cker/dockerfiles/debian-xtensa-cross.docker index b9c2e2e531..e6f93f65ee 100644 --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -18,7 +18,7 @@ RUN apt-get update && \ flex \ gettext \ git \ - python-minimal + python3-minimal =20 ENV CPU_LIST csp dc232b dc233c ENV TOOLCHAIN_RELEASE 2018.02 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/debian10.docker index 30a78813f2..dad498b52e 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -26,7 +26,7 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) diff --git a/tests/docker/dockerfiles/debian9.docker b/tests/docker/dockerf= iles/debian9.docker index b36f1d4ed8..8cbd742bb5 100644 --- a/tests/docker/dockerfiles/debian9.docker +++ b/tests/docker/dockerfiles/debian9.docker @@ -26,7 +26,7 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ python3-sphinx \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) diff --git a/tests/docker/dockerfiles/travis.docker b/tests/docker/dockerfi= les/travis.docker index e72dc85ca7..ea14da29d9 100644 --- a/tests/docker/dockerfiles/travis.docker +++ b/tests/docker/dockerfiles/travis.docker @@ -5,7 +5,7 @@ ENV LC_ALL en_US.UTF-8 RUN sed -i "s/# deb-src/deb-src/" /etc/apt/sources.list RUN apt-get update RUN apt-get -y build-dep qemu -RUN apt-get -y install device-tree-compiler python2.7 python-yaml dh-autor= econf gdb strace lsof net-tools gcovr +RUN apt-get -y install device-tree-compiler python3 python3-yaml dh-autore= conf gdb strace lsof net-tools gcovr # Travis tools require PhantomJS / Neo4j / Maven accessible # in their PATH (QEMU build won't access them). ENV PATH /usr/local/phantomjs/bin:/usr/local/phantomjs:/usr/local/neo4j-3.= 2.7/bin:/usr/local/maven-3.5.2/bin:/usr/local/cmake-3.9.2/bin:/usr/local/cl= ang-5.0.0/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfi= les/ubuntu.docker index a4f601395c..f486492224 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -60,7 +60,7 @@ ENV PACKAGES flex bison \ libvte-2.91-dev \ libxen-dev \ make \ - python-yaml \ + python3-yaml \ python3-sphinx \ sparse \ texinfo \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index 883f9bcf31..3cc4f492c4 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -47,7 +47,7 @@ ENV PACKAGES flex bison \ libvte-2.91-dev \ libxen-dev \ make \ - python-yaml \ + python3-yaml \ python3-sphinx \ sparse \ texinfo \ --=20 2.21.0