diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2020-03-23 16:15:10 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2020-03-27 13:43:20 +0000 |
| commit | cdb1a84cfe57558a34d73d0252ad0271539194e0 (patch) | |
| tree | 76a5895348ccb5086aec6826fb2c0842aaee9943 /tests/docker | |
| parent | a092a95547710bcbb8c168e5ec03f55fb4ab1ad7 (diff) | |
| download | qemu-cdb1a84cfe57558a34d73d0252ad0271539194e0.zip qemu-cdb1a84cfe57558a34d73d0252ad0271539194e0.tar.gz qemu-cdb1a84cfe57558a34d73d0252ad0271539194e0.tar.bz2 | |
tests/docker: Keep package list sorted
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>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/dockerfiles/centos7.docker | 6 | ||||
| -rw-r--r-- | 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 cdd72de..9a2a2e5 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 a652222..019eb12 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 |