All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Peter Maydell" <peter.maydell@linaro.org>
Subject: [PATCH 08/23] tests/docker: fix mistakes in centos package lists
Date: Tue,  1 Dec 2020 17:18:10 +0000	[thread overview]
Message-ID: <20201201171825.2243775-9-berrange@redhat.com> (raw)
In-Reply-To: <20201201171825.2243775-1-berrange@redhat.com>

dbus-daemon doesn't exist in centos7, it is part of dbus.

snappy is used by QEMU, not csnappy.

mesa-libEGL-devel is not used in QEMU at all, but mesa-libgbm-devel is.

vte291-devel is required for GTK3, not vte-devel.

spice-glib-devel is not use in QEMU at all, but spice-protocol is.

librdmacm-devel is a virtual provides for compat, the actual package
used is rdma-core-devel.

There is no need to specifically refer to python36, we can just
use python3 as in other distros.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/docker/dockerfiles/centos7.docker | 11 +++++------
 tests/docker/dockerfiles/centos8.docker | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
index 4372e200d7..f3ef2cf8d8 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -9,8 +9,7 @@ ENV PACKAGES \
     bzip2 \
     bzip2-devel \
     ccache \
-    csnappy-devel \
-    dbus-daemon \
+    dbus \
     gcc \
     gcc-c++ \
     gettext \
@@ -22,21 +21,21 @@ ENV PACKAGES \
     libepoxy-devel \
     libfdt-devel \
     libgcrypt-devel \
-    librdmacm-devel \
     libzstd-devel \
     lzo-devel \
     make \
-    mesa-libEGL-devel \
     mesa-libgbm-devel \
     nettle-devel \
     ninja-build \
     perl-Test-Harness \
     pixman-devel \
     python3 \
-    spice-glib-devel \
+    rdma-core-devel \
+    snappy-devel \
+    spice-protocol \
     spice-server-devel \
     tar \
-    vte-devel \
+    vte291-devel \
     xen-devel \
     zlib-devel
 RUN yum install -y $PACKAGES
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 9560bb06e2..1d10b8c263 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -18,16 +18,16 @@ ENV PACKAGES \
     libgcrypt-devel \
     lzo-devel \
     make \
-    mesa-libEGL-devel \
-    nmap-ncat \
+    mesa-libgbm-devel \
     nettle-devel \
     ninja-build \
+    nmap-ncat \
     perl-Test-Harness \
     pixman-devel \
-    python36 \
+    python3 \
     rdma-core-devel \
-    spice-glib-devel \
-    spice-server \
+    spice-protocol \
+    spice-server-devel \
     tar \
     zlib-devel
 
-- 
2.28.0



  parent reply	other threads:[~2020-12-01 17:26 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-01 17:18 [PATCH 00/23] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 01/23] hw/usb/ccid: remove references to NSS Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 02/23] tests/docker: don't use BUILDKIT in GitLab either Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 03/23] tests/docker: use project specific container registries Daniel P. Berrangé
2020-12-02 11:54   ` Gerd Hoffmann
2020-12-02 12:03     ` Daniel P. Berrangé
2021-01-13 21:17   ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 04/23] tests/docker: use explicit docker.io registry Daniel P. Berrangé
2020-12-01 17:34   ` Philippe Mathieu-Daudé
2021-01-13 21:22   ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 05/23] tests/docker: remove travis container Daniel P. Berrangé
2020-12-02 12:08   ` Thomas Huth
2021-01-13 21:26   ` Wainer dos Santos Moschetta
2020-12-01 17:18 ` [PATCH 06/23] tests/docker: remove FEATURES env var from templates Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 07/23] tests/docker: fix sorting in package lists Daniel P. Berrangé
2020-12-01 17:35   ` Philippe Mathieu-Daudé
2020-12-01 17:18 ` Daniel P. Berrangé [this message]
2020-12-01 17:18 ` [PATCH 09/23] tests/docker: fix mistakes in fedora package list Daniel P. Berrangé
2020-12-01 17:36   ` Philippe Mathieu-Daudé
2020-12-01 17:18 ` [PATCH 10/23] tests/docker: fix mistakes in ubuntu package lists Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 11/23] tests/docker: remove mingw packages from Fedora Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 12/23] tests/docker: add script for automating container refresh Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 13/23] tests/docker: expand centos7 package list Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 14/23] tests/docker: expand centos8 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 15/23] tests/docker: expand fedora " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 16/23] tests/docker: expand ubuntu1804 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 17/23] tests/docker: expand ubuntu2004 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 18/23] tests/docker: auto-generate centos7 with lcitool Daniel P. Berrangé
2020-12-02 12:07   ` Gerd Hoffmann
2020-12-04 13:37     ` Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 19/23] tests/docker: auto-generate centos8 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 20/23] tests/docker: auto-generate fedora " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 21/23] tests/docker: auto-generate ubuntu1804 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 22/23] tests/docker: auto-generate ubuntu2004 " Daniel P. Berrangé
2020-12-01 17:18 ` [PATCH 23/23] tests/docker: remove ubuntu container Daniel P. Berrangé
2020-12-01 17:53 ` [PATCH 00/23] tests/docker: start using libvirt-ci's "lcitool" for dockerfiles Kashyap Chamarthy

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=20201201171825.2243775-9-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=alex.bennee@linaro.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.