From: Wainer dos Santos Moschetta <wainersm@redhat.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>, qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: Re: [PATCH v2 07/25] tests/docker: fix sorting in package lists
Date: Fri, 15 Jan 2021 15:06:27 -0300 [thread overview]
Message-ID: <d82625fc-0742-4461-3bc9-2bc7b6ee3f61@redhat.com> (raw)
In-Reply-To: <20210114130245.1654081-8-berrange@redhat.com>
On 1/14/21 10:02 AM, Daniel P. Berrangé wrote:
> This will make diffs in later patches clearer.
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> 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 <wainersm@redhat.com>
>
> 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
next prev parent reply other threads:[~2021-01-15 18:07 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-14 13:02 [PATCH v2 00/25] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 01/25] hw/usb/ccid: remove references to NSS Daniel P. Berrangé
2021-01-15 13:42 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 02/25] tests/docker: don't use BUILDKIT in GitLab either Daniel P. Berrangé
2021-01-15 13:53 ` Wainer dos Santos Moschetta
2021-01-15 13:58 ` Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 03/25] tests/docker: use project specific container registries Daniel P. Berrangé
2021-01-14 13:21 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 04/25] tests/docker: use explicit docker.io registry Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 05/25] tests/docker: remove travis container Daniel P. Berrangé
2021-01-14 13:22 ` Philippe Mathieu-Daudé
2021-01-15 14:50 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 06/25] tests/docker: remove FEATURES env var from templates Daniel P. Berrangé
2021-01-14 14:01 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 07/25] tests/docker: fix sorting in package lists Daniel P. Berrangé
2021-01-15 18:06 ` Wainer dos Santos Moschetta [this message]
2021-01-14 13:02 ` [PATCH v2 08/25] tests/docker: fix mistakes in centos " Daniel P. Berrangé
2021-01-15 18:39 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 09/25] tests/docker: fix mistakes in fedora package list Daniel P. Berrangé
2021-01-15 18:46 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 10/25] tests/docker: fix mistakes in ubuntu package lists Daniel P. Berrangé
2021-01-15 18:55 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 11/25] tests/docker: remove mingw packages from Fedora Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 12/25] tests/docker: add script for automating container refresh Daniel P. Berrangé
2021-01-14 13:31 ` Philippe Mathieu-Daudé
2021-01-15 20:35 ` Wainer dos Santos Moschetta
2021-01-14 13:02 ` [PATCH v2 13/25] tests/docker: expand centos7 package list Daniel P. Berrangé
2021-01-14 13:34 ` Philippe Mathieu-Daudé
2021-03-03 14:51 ` Thomas Huth
2021-03-03 15:04 ` Daniel P. Berrangé
2021-01-14 13:02 ` [PATCH v2 14/25] tests/docker: expand centos8 " Daniel P. Berrangé
2021-01-14 13:34 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 15/25] tests/docker: expand fedora " Daniel P. Berrangé
2021-01-14 13:58 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 16/25] tests/docker: expand ubuntu1804 " Daniel P. Berrangé
2021-01-14 13:58 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 17/25] tests/docker: expand ubuntu2004 " Daniel P. Berrangé
2021-01-14 13:59 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 18/25] tests/docker: expand opensuse-leap " Daniel P. Berrangé
2021-01-14 13:59 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 19/25] tests/docker: auto-generate centos7 with lcitool Daniel P. Berrangé
2021-01-14 13:36 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 20/25] tests/docker: auto-generate centos8 " Daniel P. Berrangé
2021-01-14 13:36 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 21/25] tests/docker: auto-generate fedora " Daniel P. Berrangé
2021-01-14 13:37 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 22/25] tests/docker: auto-generate ubuntu1804 " Daniel P. Berrangé
2021-01-14 13:37 ` Philippe Mathieu-Daudé
2021-01-14 13:39 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 23/25] tests/docker: auto-generate ubuntu2004 " Daniel P. Berrangé
2021-01-14 13:56 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 24/25] tests/docker: auto-generate opensuse-leap " Daniel P. Berrangé
2021-01-14 13:57 ` Philippe Mathieu-Daudé
2021-01-14 13:02 ` [PATCH v2 25/25] tests/docker: remove ubuntu container Daniel P. Berrangé
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=d82625fc-0742-4461-3bc9-2bc7b6ee3f61@redhat.com \
--to=wainersm@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=fam@euphon.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--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).