From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, "Thomas Huth" <thuth@redhat.com>,
berrange@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>,
f4bug@amsat.org,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Willian Rampazzo" <willianr@redhat.com>,
stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
aurelien@aurel32.net
Subject: [PATCH v1 14/39] tests/docker: fix sorting in package lists
Date: Tue, 6 Jul 2021 15:57:52 +0100 [thread overview]
Message-ID: <20210706145817.24109-15-alex.bennee@linaro.org> (raw)
In-Reply-To: <20210706145817.24109-1-alex.bennee@linaro.org>
From: Daniel P. Berrangé <berrange@redhat.com>
This will make diffs in later patches clearer.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210623142245.307776-7-berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/docker/dockerfiles/centos8.docker | 2 +-
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, 18 insertions(+), 16 deletions(-)
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 8f810810f3..ee52305646 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -22,9 +22,9 @@ ENV PACKAGES \
lzo-devel \
make \
mesa-libEGL-devel \
- nmap-ncat \
nettle-devel \
ninja-build \
+ nmap-ncat \
perl-Test-Harness \
pixman-devel \
python36 \
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker
index 64a413f5e0..4a0a84eb43 100644
--- a/tests/docker/dockerfiles/fedora.docker
+++ b/tests/docker/dockerfiles/fedora.docker
@@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:33
# Please keep this list sorted alphabetically
ENV PACKAGES \
+ SDL2-devel \
bc \
brlapi-devel \
bzip2 \
@@ -79,10 +80,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 \
@@ -97,7 +98,6 @@ ENV PACKAGES \
python3-sphinx_rtd_theme \
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 7ebff1b3a8..6011447181 100644
--- a/tests/docker/dockerfiles/opensuse-leap.docker
+++ b/tests/docker/dockerfiles/opensuse-leap.docker
@@ -9,46 +9,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 0acdb0d9ad..a50a35e6fe 100644
--- a/tests/docker/dockerfiles/ubuntu1804.docker
+++ b/tests/docker/dockerfiles/ubuntu1804.docker
@@ -46,10 +46,10 @@ ENV PACKAGES \
libxen-dev \
libzstd-dev \
make \
- python3-yaml \
+ ninja-build \
python3-sphinx \
python3-sphinx-rtd-theme \
- ninja-build \
+ python3-yaml \
sparse \
xfslibs-dev
RUN apt-get update && \
diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker
index 88b3cfa136..eee2ef3cac 100644
--- a/tests/docker/dockerfiles/ubuntu2004.docker
+++ b/tests/docker/dockerfiles/ubuntu2004.docker
@@ -1,8 +1,10 @@
FROM docker.io/library/ubuntu:20.04
-ENV PACKAGES flex bison \
+ENV PACKAGES \
+ bison \
bsdmainutils \
ccache \
clang-10\
+ flex \
gcc \
gcovr \
genisoimage \
@@ -65,8 +67,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.20.1
next prev parent reply other threads:[~2021-07-06 15:26 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 14:57 [PATCH v1 00/39] final pre-PR for 6.1 (testing and plugins) Alex Bennée
2021-07-06 14:57 ` [PATCH v1 01/39] Jobs based on custom runners: documentation and configuration placeholder Alex Bennée
2021-07-06 14:57 ` [PATCH v1 02/39] Jobs based on custom runners: build environment docs and playbook Alex Bennée
2021-07-06 14:57 ` [PATCH v1 03/39] Jobs based on custom runners: docs and gitlab-runner setup playbook Alex Bennée
2021-07-06 14:57 ` [PATCH v1 04/39] Jobs based on custom runners: add job definitions for QEMU's machines Alex Bennée
2021-07-06 14:57 ` [PATCH v1 05/39] tests/tcg: generalise the disabling of the signals test Alex Bennée
2021-07-08 15:29 ` Peter Maydell
2021-07-06 14:57 ` [PATCH v1 06/39] build: validate that system capstone works before using it Alex Bennée
2021-07-06 14:57 ` [PATCH v1 07/39] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run Alex Bennée
2021-07-06 14:57 ` [PATCH v1 08/39] cirrus: delete FreeBSD and macOS jobs Alex Bennée
2021-07-06 14:57 ` [PATCH v1 09/39] hw/usb/ccid: remove references to NSS Alex Bennée
2021-07-06 14:57 ` [PATCH v1 10/39] tests/docker: don't use BUILDKIT in GitLab either Alex Bennée
2021-07-06 14:57 ` [PATCH v1 11/39] tests/docker: use project specific container registries Alex Bennée
2021-07-06 14:57 ` [PATCH v1 12/39] tests/docker: use explicit docker.io registry Alex Bennée
2021-07-06 14:57 ` [PATCH v1 13/39] tests/docker: remove FEATURES env var from templates Alex Bennée
2021-07-06 14:57 ` Alex Bennée [this message]
2021-07-06 14:57 ` [PATCH v1 15/39] tests/docker: fix mistakes in centos package lists Alex Bennée
2021-07-06 14:57 ` [PATCH v1 16/39] tests/docker: fix mistakes in fedora package list Alex Bennée
2021-07-06 14:57 ` [PATCH v1 17/39] tests/docker: fix mistakes in ubuntu package lists Alex Bennée
2021-07-07 14:41 ` Philippe Mathieu-Daudé
2021-07-07 14:49 ` Daniel P. Berrangé
2021-07-06 14:57 ` [PATCH v1 18/39] tests/docker: remove mingw packages from Fedora Alex Bennée
2021-07-06 14:57 ` [PATCH v1 19/39] tests/docker: expand centos8 package list Alex Bennée
2021-07-06 14:57 ` [PATCH v1 20/39] tests/docker: expand fedora " Alex Bennée
2021-07-06 14:57 ` [PATCH v1 21/39] tests/docker: expand ubuntu1804 " Alex Bennée
2021-07-06 14:58 ` [PATCH v1 22/39] tests/docker: expand ubuntu2004 " Alex Bennée
2021-07-06 14:58 ` [PATCH v1 23/39] tests/docker: expand opensuse-leap " Alex Bennée
2021-07-06 14:58 ` [PATCH v1 24/39] tests/vm: update NetBSD to 9.2 Alex Bennée
2021-07-06 14:58 ` [PATCH v1 25/39] tests/vm: update openbsd to release 6.9 Alex Bennée
2021-07-06 14:58 ` [PATCH v1 26/39] tests/tcg: make test-mmap a little less aggressive Alex Bennée
2021-07-06 14:58 ` [PATCH v1 27/39] plugins: fix-up handling of internal hostaddr for 32 bit Alex Bennée
2021-07-06 14:58 ` [PATCH v1 28/39] meson.build: move TCG plugin summary output Alex Bennée
2021-07-06 14:58 ` [PATCH v1 29/39] configure: don't allow plugins to be enabled for a non-TCG build Alex Bennée
2021-07-07 4:17 ` Thomas Huth
2021-07-06 14:58 ` [PATCH v1 30/39] configure: stop user enabling plugins on Windows for now Alex Bennée
2021-07-07 4:24 ` Thomas Huth
2021-07-06 14:58 ` [PATCH v1 31/39] tcg/plugins: enable by default for TCG builds Alex Bennée
2021-07-07 4:32 ` Thomas Huth
2021-07-06 14:58 ` [PATCH v1 32/39] contrib/plugins: enable -Wall for building plugins Alex Bennée
2021-07-07 4:36 ` Thomas Huth
2021-07-06 14:58 ` [PATCH v1 33/39] contrib/plugins: add execlog to log instruction execution and memory access Alex Bennée
2021-07-06 14:58 ` [PATCH v1 34/39] docs/devel: tcg-plugins: add execlog plugin description Alex Bennée
2021-07-06 14:58 ` [PATCH v1 35/39] plugins: Added a new cache modelling plugin Alex Bennée
2021-07-06 14:58 ` [PATCH v1 36/39] plugins/cache: Enable cache parameterization Alex Bennée
2021-07-06 14:58 ` [PATCH v1 37/39] plugins/cache: Added FIFO and LRU eviction policies Alex Bennée
2021-07-06 14:58 ` [PATCH v1 38/39] docs/devel: Added cache plugin to the plugins docs Alex Bennée
2021-07-06 14:58 ` [PATCH v1 39/39] MAINTAINTERS: Added myself as a reviewer for TCG Plugins Alex Bennée
2021-07-06 15:35 ` Peter Maydell
2021-07-07 8:33 ` [PATCH v1 00/39] final pre-PR for 6.1 (testing and plugins) Philippe Mathieu-Daudé
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=20210706145817.24109-15-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=willianr@redhat.com \
/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).