From nobody Fri May 3 22:16:03 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=1569018355; cv=none; d=zoho.com; s=zohoarc; b=cVyx93V4JA+Vrq7zZsyOgNtCzx4qhfTU33SAK5G6HSTb5WZbSP7Go9MtE4g6Uu4ScYryL79nDtjHVw8mU6B5df+IVUDcgDC7y+83YlHlwbTKfbrHWJgipXTnmwXL90e2QnUP6lPF+oITmgvxsP/YDBFJNpgzyVjbbIoLv07HqrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569018355; 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=GBNnQfFHPm0fTQVVcXmNYCqq4o9jNZ9DuAqxPS3KwAo=; b=VA2o4+1kpWM25974GTw1+pI6gnEgk69P6epRKTqyQx5Tii1JDTj1rUesTsfwhR/kgDVyz7nxB1YJIgRCbJs9TUiifHdXISMkJ0VoPSmkNWQdVX4RTtPIhLM943n5WhQnxWGnvPXEP+GIXLjVbRgEKYIF6KGUejsmUN40baujOc8= 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 1569018355947105.24368897236161; Fri, 20 Sep 2019 15:25:55 -0700 (PDT) Received: from localhost ([::1]:35890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBRLe-00087H-Pd for importer@patchew.org; Fri, 20 Sep 2019 18:25:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57752) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBR9K-0000JY-Lu for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iBR9J-00070h-8b for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48006) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iBR9I-0006x9-Vq for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:09 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9233C308123B; Fri, 20 Sep 2019 22:13:06 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-38.bos.redhat.com [10.18.17.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id F25C15D9C3; Fri, 20 Sep 2019 22:13:05 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v2 1/5] docker: move tests from python2 to python3 Date: Fri, 20 Sep 2019 18:12:51 -0400 Message-Id: <20190920221255.30412-2-jsnow@redhat.com> In-Reply-To: <20190920221255.30412-1-jsnow@redhat.com> References: <20190920221255.30412-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 20 Sep 2019 22:13:06 +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 Message-id: 20190920200049.27216-1-jsnow@redhat.com 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-ports.docker | 2 +- tests/docker/dockerfiles/debian-sid.docker | 2 +- tests/docker/dockerfiles/debian-xtensa-cross.docker | 2 +- tests/docker/dockerfiles/debian10.docker | 2 +- tests/docker/dockerfiles/debian8.docker | 3 +-- tests/docker/dockerfiles/debian9.docker | 2 +- tests/docker/dockerfiles/travis.docker | 2 +- tests/docker/dockerfiles/ubuntu.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- 10 files changed, 10 insertions(+), 11 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-ports.docker b/tests/docker/do= ckerfiles/debian-ports.docker index 61bc3f2993..f1ea8d3bd1 100644 --- a/tests/docker/dockerfiles/debian-ports.docker +++ b/tests/docker/dockerfiles/debian-ports.docker @@ -31,6 +31,6 @@ RUN apt-get update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ texinfo \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dock= erfiles/debian-sid.docker index 2a1bcc33b2..dcb8e83715 100644 --- a/tests/docker/dockerfiles/debian-sid.docker +++ b/tests/docker/dockerfiles/debian-sid.docker @@ -31,5 +31,5 @@ RUN apt update && \ git \ pkg-config \ psmisc \ - python \ + python3 \ texinfo || { echo "Failed to build - see debian-sid.docker notes";= exit 1; } 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/debian8.docker b/tests/docker/dockerf= iles/debian8.docker index 1212a85c35..be67023826 100644 --- a/tests/docker/dockerfiles/debian8.docker +++ b/tests/docker/dockerfiles/debian8.docker @@ -30,5 +30,4 @@ RUN apt update && \ git \ gnupg \ pkg-config \ - python-minimal - + python3-minimal 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 From nobody Fri May 3 22:16:03 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=1569017809; cv=none; d=zoho.com; s=zohoarc; b=H2uS9HegM/O0jZT8pfFchtPzKd2uP4Dr0q3mJtgAl579KLP3sRTPZRoqOyMWLi863hB1eIA+o++6IUhp+T2B9z2RlOh1ZDIT78MZzUjfXcw1NkU5xM/Y2sYgzrwrzpkEzhh2zeAl7v8He8z5QOElWFvVbRLzVlpMGkV6YwAsfgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569017809; 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=sopKeXeL7BlaBJ64dps3i0w6F2uWOJOKbtVl8jqB3co=; b=iTa+fZ3xTeV/rp4OdexXHQHmOGWQqHFhhHOR7cJbwuL1e7a5ZcywYb+Jx6qO153e5NsJvcvJxHAXgcnhx0jPJDb4thLFRU1C9hMwCcuUo+BuhqNrm0rWbSaBIsO/zI9SC8x4yWuInQI/X7o/iBazqQgont0m6L5F1l/wWbA8w4c= 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 1569017809604605.424581732664; Fri, 20 Sep 2019 15:16:49 -0700 (PDT) Received: from localhost ([::1]:35802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBRCm-0005qr-OM for importer@patchew.org; Fri, 20 Sep 2019 18:16:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57726) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBR9J-00007h-A0 for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iBR9I-0006zv-9U for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iBR9I-0006xr-3q for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:08 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55D6F36955; Fri, 20 Sep 2019 22:13:07 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-38.bos.redhat.com [10.18.17.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id B448D5D9CD; Fri, 20 Sep 2019 22:13:06 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v2 2/5] docker: remove 'deprecated' image definitions Date: Fri, 20 Sep 2019 18:12:52 -0400 Message-Id: <20190920221255.30412-3-jsnow@redhat.com> In-Reply-To: <20190920221255.30412-1-jsnow@redhat.com> References: <20190920221255.30412-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 20 Sep 2019 22:13:07 +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 Message-id: 20190920001413.22567-2-jsnow@redhat.com --- 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 d796f71b63..0d75260e46 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 debian8 debian9 debian10 debian-sid +DOCKER_PARTIAL_IMAGES :=3D debian8 debian9 debian10 debian-sid DOCKER_PARTIAL_IMAGES +=3D debian8-mxe debian9-mxe debian-ports debian-boo= tstrap -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 Fri May 3 22:16:03 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=1569018093; cv=none; d=zoho.com; s=zohoarc; b=b24tjCjDZNJIqoV6eb5iQn9duREFIpuG2KcUcuNeEm66ESJcGJakW3uauDw5KC6JGSTN5ycV14Zi8YeVWBYa+NkGfzpqV3NBhSeNDryNr+5fpmQTHZ1hWKV84+OHgUrRkMgiinTipCeu7hiOzCQhqkvIZQIzVrqTLskAN8xw4DM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569018093; 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=7/szIz+Gih9+lvFpdXJJxNrmL0s6biPPzh2iOqtsQgw=; b=a02AUxdyMt+Lx5GwmaQpiXg441teiVM/8MB+fulylibWiS3tElGT2zSXCCHEH4cN6SVBj6rEAhV9pm3Jb8b/n9DEDzn++kzn6HHY/Tm+Q3UOfcm4bhn0WJKRQFqkXBF0MzYZVQ1OFcShd6h9VIMYxnQtHtxCoQx4LJICLVTFaII= 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 1569018093111103.87074664807915; Fri, 20 Sep 2019 15:21:33 -0700 (PDT) Received: from localhost ([::1]:35830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBRHH-0002R6-VT for importer@patchew.org; Fri, 20 Sep 2019 18:21:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57737) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBR9K-0000EI-1P for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iBR9J-00070Y-2A for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37712) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iBR9I-0006zr-Sz for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:09 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1AC4B8980E5; Fri, 20 Sep 2019 22:13:08 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-38.bos.redhat.com [10.18.17.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7977C5D9C3; Fri, 20 Sep 2019 22:13:07 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v2 3/5] docker: remove debian8-mxe definitions Date: Fri, 20 Sep 2019 18:12:53 -0400 Message-Id: <20190920221255.30412-4-jsnow@redhat.com> In-Reply-To: <20190920221255.30412-1-jsnow@redhat.com> References: <20190920221255.30412-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Fri, 20 Sep 2019 22:13:08 +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. Signed-off-by: John Snow Message-id: 20190920001413.22567-3-jsnow@redhat.com 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 0d75260e46..0a7fc8bc79 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 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 $(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 --=20 2.21.0 From nobody Fri May 3 22:16:03 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=1569018239; cv=none; d=zoho.com; s=zohoarc; b=kyuSiiSKbwil1wiSw+oizVqd2QZyEK+cafgT/2nIw+K547/GJEnpu4yeYewtHd93USp9vzkfRJ36oTAg6GtGGeMpSUrWeFymkPinLsC4UfIkCdN7JvCVi5fZZnjPcDB51zzVulRHU0sQJYtzwMgB25KksCtmOMpeH368FTKTSfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569018239; 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=WNDBXjTeIuivdRcJ9gPeNEHeKkCRrHGOwkphO5KK4KY=; b=lE8tRvGAMehvykWbgi+BEbeNsK9JVT/GukgiEq4q36VImh4kbilTA74mmNsUxUXFnpcknFEC5arZ2yfh2nR7A2wUx+Y9RM6h3R/4dBaNj9CfsOnrqJheP/EdifCIx590pcVpZ0v/0S+8vBzHcri6DPVXcL12WNWbT/u22fBVotA= 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 1569018239012243.55290276087942; Fri, 20 Sep 2019 15:23:59 -0700 (PDT) Received: from localhost ([::1]:35872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBRJl-0005os-Ed for importer@patchew.org; Fri, 20 Sep 2019 18:23:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57755) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBR9K-0000KI-Np for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iBR9J-000710-Pe for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43702) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iBR9J-00070U-KZ for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:09 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D2BE430842A8; Fri, 20 Sep 2019 22:13:08 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-38.bos.redhat.com [10.18.17.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D2225D9C3; Fri, 20 Sep 2019 22:13:08 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v2 4/5] docker: remove unused debian-sid and debian-ports Date: Fri, 20 Sep 2019 18:12:54 -0400 Message-Id: <20190920221255.30412-5-jsnow@redhat.com> In-Reply-To: <20190920221255.30412-1-jsnow@redhat.com> References: <20190920221255.30412-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 20 Sep 2019 22:13:08 +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" These are listed as "partial" images, but have no user. Remove them. Signed-off-by: John Snow Message-id: 20190920001413.22567-4-jsnow@redhat.com --- tests/docker/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0a7fc8bc79..cb41652885 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,8 +5,8 @@ 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 debian8 debian9 debian10 debian-sid -DOCKER_PARTIAL_IMAGES +=3D debian9-mxe debian-ports debian-bootstrap +DOCKER_PARTIAL_IMAGES :=3D debian8 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)) # Use a global constant ccache directory to speed up repetitive builds --=20 2.21.0 From nobody Fri May 3 22:16:03 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=1569017816; cv=none; d=zoho.com; s=zohoarc; b=PNk3IlyOrb0VcWQBRBMc2oYcqpxD1OzRlsoJ1OzVPcAOnfI+YxiQamNTUFg26JtrmNKGheaAP6ceLm1BM2VtlUSsz8mEKe7sp2Cl8sHhkaJjGCXK2BOKARfRw5llTvjMPAahXYyDiaMqYqQTOJWDTUoh49hKmztXuJmfP9R4QUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569017816; 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=NGAsCHEqSeRSE7G2AFO+ZTzM2tmqO8PNfnVZ1UmsK4M=; b=HkdvShj4vFAUWGLYIYS1whOqOKIsohfuoBpJqeKuMgrzE0L6ad8/eRP5qWI2nhTuoQotVbd7VTlhpdYwp8k1D0dAsqSQivKH1FrhB2+Zd/eCEGKSwORcDbOxqVSuntR1RjDFXWBn9940RmHvNb6QOwxmcW6qATVS9HFHQ1jQCWY= 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 1569017816346503.8624511533991; Fri, 20 Sep 2019 15:16:56 -0700 (PDT) Received: from localhost ([::1]:35806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBRCt-00061X-Nv for importer@patchew.org; Fri, 20 Sep 2019 18:16:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57767) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iBR9L-0000QX-PP for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iBR9K-00071K-Id for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7572) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iBR9K-00070y-Cp for qemu-devel@nongnu.org; Fri, 20 Sep 2019 18:13:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 959A6307CDE7; Fri, 20 Sep 2019 22:13:09 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-38.bos.redhat.com [10.18.17.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 008A55D9C3; Fri, 20 Sep 2019 22:13:08 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v2 5/5] docker: removed unused debian8 partial image Date: Fri, 20 Sep 2019 18:12:55 -0400 Message-Id: <20190920221255.30412-6-jsnow@redhat.com> In-Reply-To: <20190920221255.30412-1-jsnow@redhat.com> References: <20190920221255.30412-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 20 Sep 2019 22:13:09 +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. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 3 +-- tests/docker/dockerfiles/debian8.docker | 33 ------------------------- 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 cb41652885..b9430822b8 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -5,8 +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 debian8 debian9 debian10 -DOCKER_PARTIAL_IMAGES +=3D debian9-mxe debian-bootstrap +DOCKER_PARTIAL_IMAGES :=3D debian9 debian9-mxe debian10 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/debian8.docker b/tests/docker/dockerf= iles/debian8.docker deleted file mode 100644 index be67023826..0000000000 --- a/tests/docker/dockerfiles/debian8.docker +++ /dev/null @@ -1,33 +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 \ - python3-minimal --=20 2.21.0