[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 08/12] tests/docker: Keep package list sorted
From: |
Alex Bennée |
Subject: |
[PULL v2 08/12] tests/docker: Keep package list sorted |
Date: |
Fri, 27 Mar 2020 18:13:16 +0000 |
From: Philippe Mathieu-Daudé <address@hidden>
Keep package list sorted, this eases rebase/cherry-pick.
Fixes: 3a6784813
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Message-Id: <address@hidden>
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
--
2.20.1
- [PULL v2 for 5.0 00/12] testing updates (+ one mttcg change), Alex Bennée, 2020/03/27
- [PULL v2 01/12] qemu/atomic.h: add #ifdef guards for stdatomic.h, Alex Bennée, 2020/03/27
- [PULL v2 03/12] tests/vm: move vga setup, Alex Bennée, 2020/03/27
- [PULL v2 02/12] tests/vm: write raw console log, Alex Bennée, 2020/03/27
- [PULL v2 04/12] tests/vm: update FreeBSD to 12.1, Alex Bennée, 2020/03/27
- [PULL v2 05/12] tests/vm: update NetBSD to 9.0, Alex Bennée, 2020/03/27
- [PULL v2 07/12] configure: disable MTTCG for MIPS guests, Alex Bennée, 2020/03/27
- [PULL v2 09/12] tests/docker: Install gcrypt devel package in Debian image, Alex Bennée, 2020/03/27
- [PULL v2 06/12] tests/vm: fix basevm config, Alex Bennée, 2020/03/27
- [PULL v2 08/12] tests/docker: Keep package list sorted,
Alex Bennée <=
- [PULL v2 10/12] tests/docker: Use Python3 PyYAML in the Fedora image, Alex Bennée, 2020/03/27
- [PULL v2 12/12] .travis.yml: Add a KVM-only s390x job, Alex Bennée, 2020/03/27
- [PULL v2 11/12] tests/docker: Add libepoxy and libudev packages to the Fedora image, Alex Bennée, 2020/03/27
- Re: [PULL v2 for 5.0 00/12] testing updates (+ one mttcg change), Peter Maydell, 2020/03/27