scripts/ci/org.centos/stream/8/build-environment.yml has a slightly different
list of packages compared to scripts/ci/setup/build-environment.yaml. Make
them the same for simplicity.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
.../org.centos/stream/8/build-environment.yml | 25 +++++++++++++++++++
scripts/ci/setup/build-environment.yml | 20 ++++++++++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml
b/scripts/ci/org.centos/stream/8/build-environment.yml
index 95474ad034dc..b1768d18afac 100644
--- a/scripts/ci/org.centos/stream/8/build-environment.yml
+++ b/scripts/ci/org.centos/stream/8/build-environment.yml
@@ -30,13 +30,26 @@
- name: Install basic packages to build QEMU on CentOS Stream 8
dnf:
name:
+ - bzip2
+ - bzip2-devel
- capstone-devel
+ - dbus-daemon
- device-mapper-multipath-devel
+ - diffutils
+ - gcc
+ - gcc-c++
+ - genisoimage
+ - gettext
+ - git
+ - glib2-devel
- glusterfs-api-devel
- gnutls-devel
+ - libaio-devel
- libcap-ng-devel
- libcurl-devel
+ - libepoxy-devel
- libfdt-devel
+ - libgcrypt-devel
- libiscsi-devel
- libpmem-devel
- librados-devel
@@ -44,13 +57,25 @@
- libseccomp-devel
- libssh-devel
- libxkbcommon-devel
+ - lzo-devel
+ - make
+ - mesa-libEGL-devel
+ - nettle-devel
- ninja-build
+ - nmap-ncat
- numactl-devel
+ - pixman-devel
+ - python36
- python3-sphinx
+ - rdma-core-devel
- redhat-rpm-config
- snappy-devel
+ - spice-glib-devel
- spice-server-devel
- systemd-devel
+ - systemtap-sdt-devel
+ - tar
+ - zlib-devel
state: present
when:
- centos_stream_8
diff --git a/scripts/ci/setup/build-environment.yml
b/scripts/ci/setup/build-environment.yml
index 2e5f3b06028a..2274f736f7de 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -160,6 +160,7 @@
- bzip2-devel
- capstone-devel
- dbus-daemon
+ - device-mapper-multipath-devel
- diffutils
- gcc
- gcc-c++
@@ -167,20 +168,36 @@
- gettext
- git
- glib2-devel
+ - glusterfs-api-devel
+ - gnutls-devel
- libaio-devel
+ - libcap-ng-devel
+ - libcurl-devel
- libepoxy-devel
+ - libfdt-devel
- libgcrypt-devel
+ - libiscsi-devel
+ - libpmem-devel
+ - librados-devel
+ - librbd-devel
+ - libseccomp-devel
+ - libssh-devel
+ - libxkbcommon-devel
- lzo-devel
- make
- mesa-libEGL-devel
- nettle-devel
- ninja-build
- nmap-ncat
- - perl-Test-Harness
+ - numactl-devel
- pixman-devel
- python36
+ - python3-sphinx
- rdma-core-devel
+ - redhat-rpm-config
+ - snappy-devel
- spice-glib-devel
+ - systemd-devel
- systemtap-sdt-devel
- tar
- zlib-devel
@@ -194,6 +211,7 @@
# Spice server not available in ppc64le
name:
- spice-server
+ - spice-server-devel
state: present
when:
- ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
--
2.38.1
