[PULL,07/11] tests/docker: Keep package list sorted

Message ID	20200325151543.32478-8-alex.bennee@linaro.org
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Subject: [PULL 07/11] tests/docker: Keep package list sorted Date: Wed, 25 Mar 2020 15:15:39 +0000 Message-Id: <20200325151543.32478-8-alex.bennee@linaro.org> In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Richard Henderson <richard.henderson@linaro.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@redhat.com>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/11] tests/vm: write raw console log \| expand [PULL,01/11] tests/vm: write raw console log [PULL,02/11] tests/vm: move vga setup [PULL,03/11] tests/vm: update FreeBSD to 12.1 [PULL,04/11] tests/vm: update NetBSD to 9.0 [PULL,05/11] tests/vm: fix basevm config [PULL,06/11] configure: disable MTTCG for MIPS guests [PULL,07/11] tests/docker: Keep package list sorted [PULL,08/11] tests/docker: Install gcrypt devel package in Debian image [PULL,09/11] tests/docker: Use Python3 PyYAML in the Fedora image [PULL,10/11] tests/docker: Add libepoxy and libudev packages to the Fedora image [PULL,11/11] .travis.yml: Add a KVM-only s390x job

Message ID

20200325151543.32478-8-alex.bennee@linaro.org

State

New

Headers

From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Subject: [PULL 07/11] tests/docker: Keep package list sorted
Date: Wed, 25 Mar 2020 15:15:39 +0000
Message-Id: <20200325151543.32478-8-alex.bennee@linaro.org>
In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org>
References: <20200325151543.32478-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: Fam Zheng <fam@euphon.net>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, Richard Henderson
	<richard.henderson@linaro.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=
	<philmd@redhat.com>,  qemu-devel@nongnu.org
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

[PULL,01/11] tests/vm: write raw console log | expand

Commit Message

Alex Bennée March 25, 2020, 3:15 p.m. UTC

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Keep package list sorted, this eases rebase/cherry-pick.

Fixes: 3a6784813
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200322120104.21267-2-philmd@redhat.com>
Message-Id: <20200323161514.23952-8-alex.bennee@linaro.org>

diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
index cdd72de7ebf..9a2a2e515d7 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -2,6 +2,8 @@  FROM centos:7
 RUN yum install -y epel-release centos-release-xen-48
 
 RUN yum -y update
+
+# Please keep this list sorted alphabetically
 ENV PACKAGES \
     bison \
     bzip2 \
@@ -19,6 +21,7 @@  ENV PACKAGES \
     libepoxy-devel \
     libfdt-devel \
     librdmacm-devel \
+    libzstd-devel \
     lzo-devel \
     make \
     mesa-libEGL-devel \
@@ -33,7 +36,6 @@  ENV PACKAGES \
     tar \
     vte-devel \
     xen-devel \
-    zlib-devel \
-    libzstd-devel
+    zlib-devel
 RUN yum install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index a6522228c02..019eb12dcb1 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -1,4 +1,6 @@ 
 FROM fedora:30
+
+# Please keep this list sorted alphabetically
 ENV PACKAGES \
     bc \
     bison \
@@ -38,6 +40,7 @@  ENV PACKAGES \
     libubsan \
     libusbx-devel \
     libxml2-devel \
+    libzstd-devel \
     llvm \
     lzo-devel \
     make \
@@ -92,8 +95,7 @@  ENV PACKAGES \
     vte291-devel \
     which \
     xen-devel \
-    zlib-devel \
-    libzstd-devel
+    zlib-devel
 ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3
 
 RUN dnf install -y $PACKAGES

[PULL,07/11] tests/docker: Keep package list sorted

Commit Message

Patch