[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/4] tests/docker: Keep package list sorted
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 1/4] tests/docker: Keep package list sorted |
Date: |
Fri, 20 Mar 2020 20:05:50 +0100 |
Keep package list sorted, this eases rebase/cherry-pick.
Fixes: 3a6784813
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
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