From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH-for-5.0 v2 1/4] tests/docker: Keep package list sorted
Date: Sun, 22 Mar 2020 13:01:01 +0100 [thread overview]
Message-ID: <20200322120104.21267-2-philmd@redhat.com> (raw)
In-Reply-To: <20200322120104.21267-1-philmd@redhat.com>
Keep package list sorted, this eases rebase/cherry-pick.
Fixes: 3a6784813
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/docker/dockerfiles/centos7.docker | 6 ++++--
tests/docker/dockerfiles/fedora.docker | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
index cdd72de7eb..9a2a2e515d 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 a6522228c0..019eb12dcb 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
--
2.21.1
next prev parent reply other threads:[~2020-03-22 12:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-22 12:01 [PATCH-for-5.0 v2 0/4] tests/docker: Fixes for 5.0 Philippe Mathieu-Daudé
2020-03-22 12:01 ` Philippe Mathieu-Daudé [this message]
2020-03-22 12:01 ` [PATCH-for-5.0 v2 2/4] tests/docker: Install gcrypt devel package in Debian image Philippe Mathieu-Daudé
2020-03-23 10:08 ` Philippe Mathieu-Daudé
2020-03-22 12:01 ` [PATCH-for-5.0 v2 3/4] tests/docker: Use Python3 PyYAML in the Fedora image Philippe Mathieu-Daudé
2020-03-22 12:01 ` [PATCH-for-5.0 v2 4/4] tests/docker: Add libepoxy and libudev packages to " Philippe Mathieu-Daudé
2020-03-23 9:58 ` [PATCH-for-5.0 v2 0/4] tests/docker: Fixes for 5.0 Alex Bennée
2020-03-23 10:06 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200322120104.21267-2-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).