Re: [PATCH v2 07/25] tests/docker: fix sorting in package lists
On 1/14/21 10:02 AM, Daniel P. Berrangé wrote: This will make diffs in later patches clearer. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé --- tests/docker/dockerfiles/centos7.docker | 4 ++-- tests/docker/dockerfiles/fedora.docker| 4 ++-- tests/docker/dockerfiles/opensuse-leap.docker | 16 tests/docker/dockerfiles/ubuntu1804.docker| 4 ++-- tests/docker/dockerfiles/ubuntu2004.docker| 8 +--- 5 files changed, 19 insertions(+), 17 deletions(-) Reviewed-by: Wainer dos Santos Moschetta diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker index 66d805dec3..b2a4719284 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -5,13 +5,14 @@ RUN yum -y update # Please keep this list sorted alphabetically ENV PACKAGES \ +SDL2-devel \ bzip2 \ bzip2-devel \ ccache \ csnappy-devel \ dbus-daemon \ -gcc-c++ \ gcc \ +gcc-c++ \ gettext \ git \ glib2-devel \ @@ -32,7 +33,6 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ -SDL2-devel \ spice-glib-devel \ spice-server-devel \ tar \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index d9b764aea2..03b88f1cfe 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:32 # Please keep this list sorted alphabetically ENV PACKAGES \ +SDL2-devel \ bc \ brlapi-devel \ bzip2 \ @@ -74,10 +75,10 @@ ENV PACKAGES \ mingw64-pixman \ mingw64-pkg-config \ mingw64-SDL2 \ -nmap-ncat \ ncurses-devel \ nettle-devel \ ninja-build \ +nmap-ncat \ numactl-devel \ perl \ perl-Test-Harness \ @@ -91,7 +92,6 @@ ENV PACKAGES \ python3-sphinx \ python3-virtualenv \ rdma-core-devel \ -SDL2-devel \ snappy-devel \ sparse \ spice-server-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index e7dc14bf99..ed194125a7 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -8,46 +8,46 @@ ENV PACKAGES \ cyrus-sasl-devel \ gcc \ gcc-c++ \ -mkisofs \ gettext-runtime \ git \ glib2-devel \ glusterfs-devel \ -libgnutls-devel \ gtk3-devel \ +libSDL2-devel \ +libSDL2_image-devel \ libaio-devel \ libattr-devel \ libcap-ng-devel \ libepoxy-devel \ libfdt-devel \ +libgnutls-devel \ libiscsi-devel \ libjpeg8-devel \ +libnuma-devel \ +libpixman-1-0-devel \ libpmem-devel \ libpng16-devel \ librbd-devel \ libseccomp-devel \ +libspice-server-devel \ libssh-devel \ lzo-devel \ make \ -libSDL2_image-devel \ +mkisofs \ ncurses-devel \ ninja \ -libnuma-devel \ perl \ -libpixman-1-0-devel \ python3-base \ python3-virtualenv \ rdma-core-devel \ -libSDL2-devel \ snappy-devel \ -libspice-server-devel \ systemd-devel \ systemtap-sdt-devel \ tar \ usbredir-devel \ virglrenderer-devel \ -xen-devel \ vte-devel \ +xen-devel \ zlib-devel ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.6 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 3534111637..58a373e205 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -45,9 +45,9 @@ ENV PACKAGES \ libxen-dev \ libzstd-dev \ make \ -python3-yaml \ -python3-sphinx \ ninja-build \ +python3-sphinx \ +python3-yaml \ sparse \ xfslibs-dev RUN apt-get update && \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 552b57f903..2bb7e2ab1e 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,7 +1,9 @@ FROM docker.io/library/ubuntu:20.04 -ENV PACKAGES flex bison \ +ENV PACKAGES \ +bison \ ccache \ clang-10\ +flex \ gcc \ genisoimage \ gettext \ @@ -60,8 +62,8 @@ ENV PACKAGES flex bison \ sparse \ tesseract-ocr \ tesseract-ocr-eng \ -xfslibs-dev\ -vim +vim \ +xfslibs-dev RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt
[PATCH v2 07/25] tests/docker: fix sorting in package lists
This will make diffs in later patches clearer. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Daniel P. Berrangé --- tests/docker/dockerfiles/centos7.docker | 4 ++-- tests/docker/dockerfiles/fedora.docker| 4 ++-- tests/docker/dockerfiles/opensuse-leap.docker | 16 tests/docker/dockerfiles/ubuntu1804.docker| 4 ++-- tests/docker/dockerfiles/ubuntu2004.docker| 8 +--- 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker index 66d805dec3..b2a4719284 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -5,13 +5,14 @@ RUN yum -y update # Please keep this list sorted alphabetically ENV PACKAGES \ +SDL2-devel \ bzip2 \ bzip2-devel \ ccache \ csnappy-devel \ dbus-daemon \ -gcc-c++ \ gcc \ +gcc-c++ \ gettext \ git \ glib2-devel \ @@ -32,7 +33,6 @@ ENV PACKAGES \ perl-Test-Harness \ pixman-devel \ python3 \ -SDL2-devel \ spice-glib-devel \ spice-server-devel \ tar \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index d9b764aea2..03b88f1cfe 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:32 # Please keep this list sorted alphabetically ENV PACKAGES \ +SDL2-devel \ bc \ brlapi-devel \ bzip2 \ @@ -74,10 +75,10 @@ ENV PACKAGES \ mingw64-pixman \ mingw64-pkg-config \ mingw64-SDL2 \ -nmap-ncat \ ncurses-devel \ nettle-devel \ ninja-build \ +nmap-ncat \ numactl-devel \ perl \ perl-Test-Harness \ @@ -91,7 +92,6 @@ ENV PACKAGES \ python3-sphinx \ python3-virtualenv \ rdma-core-devel \ -SDL2-devel \ snappy-devel \ sparse \ spice-server-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index e7dc14bf99..ed194125a7 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -8,46 +8,46 @@ ENV PACKAGES \ cyrus-sasl-devel \ gcc \ gcc-c++ \ -mkisofs \ gettext-runtime \ git \ glib2-devel \ glusterfs-devel \ -libgnutls-devel \ gtk3-devel \ +libSDL2-devel \ +libSDL2_image-devel \ libaio-devel \ libattr-devel \ libcap-ng-devel \ libepoxy-devel \ libfdt-devel \ +libgnutls-devel \ libiscsi-devel \ libjpeg8-devel \ +libnuma-devel \ +libpixman-1-0-devel \ libpmem-devel \ libpng16-devel \ librbd-devel \ libseccomp-devel \ +libspice-server-devel \ libssh-devel \ lzo-devel \ make \ -libSDL2_image-devel \ +mkisofs \ ncurses-devel \ ninja \ -libnuma-devel \ perl \ -libpixman-1-0-devel \ python3-base \ python3-virtualenv \ rdma-core-devel \ -libSDL2-devel \ snappy-devel \ -libspice-server-devel \ systemd-devel \ systemtap-sdt-devel \ tar \ usbredir-devel \ virglrenderer-devel \ -xen-devel \ vte-devel \ +xen-devel \ zlib-devel ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.6 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 3534111637..58a373e205 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -45,9 +45,9 @@ ENV PACKAGES \ libxen-dev \ libzstd-dev \ make \ -python3-yaml \ -python3-sphinx \ ninja-build \ +python3-sphinx \ +python3-yaml \ sparse \ xfslibs-dev RUN apt-get update && \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 552b57f903..2bb7e2ab1e 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,7 +1,9 @@ FROM docker.io/library/ubuntu:20.04 -ENV PACKAGES flex bison \ +ENV PACKAGES \ +bison \ ccache \ clang-10\ +flex \ gcc \ genisoimage \ gettext \ @@ -60,8 +62,8 @@ ENV PACKAGES flex bison \ sparse \ tesseract-ocr \ tesseract-ocr-eng \ -xfslibs-dev\ -vim +vim \ +xfslibs-dev RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt -- 2.29.2
