Capstone is not provided anymore by QEMU as a submodule since
commit 83602083b4ad ("capstone: Remove the capstone submodule", 2022-05-18).
For the org.centos/stream/8 playbook to actually provide a usable
build environment, it needs to include the capstone-devel package.
Include it in the "basic" build packages as well so that the resulting
QEMU has full disassembling functionality.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
scripts/ci/org.centos/stream/8/build-environment.yml | 9 +++++++++
scripts/ci/setup/build-environment.yml | 11 +++++++++++
2 files changed, 20 insertions(+)
diff --git a/scripts/ci/org.centos/stream/8/build-environment.yml
b/scripts/ci/org.centos/stream/8/build-environment.yml
index fe8807b7b074..95474ad034dc 100644
--- a/scripts/ci/org.centos/stream/8/build-environment.yml
+++ b/scripts/ci/org.centos/stream/8/build-environment.yml
@@ -10,6 +10,14 @@
check_mode: yes
register: centos_stream_8
+ - name: Enable EPEL repo on CentOS Stream 8
+ dnf:
+ name:
+ - epel-release
+ state: present
+ when:
+ - centos_stream_8
+
- name: Enable PowerTools repo on CentOS Stream 8
ini_file:
path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo
@@ -22,6 +30,7 @@
- name: Install basic packages to build QEMU on CentOS Stream 8
dnf:
name:
+ - capstone-devel
- device-mapper-multipath-devel
- glusterfs-api-devel
- gnutls-devel
diff --git a/scripts/ci/setup/build-environment.yml
b/scripts/ci/setup/build-environment.yml
index ad63bbb3ccf7..2e5f3b06028a 100644
--- a/scripts/ci/setup/build-environment.yml
+++ b/scripts/ci/setup/build-environment.yml
@@ -46,6 +46,7 @@
- libbrlapi-dev
- libbz2-dev
- libcacard-dev
+ - libcapstone-dev
- libcap-ng-dev
- libcurl4-gnutls-dev
- libdrm-dev
@@ -130,6 +131,15 @@
- ansible_facts['distribution_version'] == '20.04'
- ansible_facts['architecture'] == 'aarch64'
+ - name: Enable EPEL repo on EL8
+ dnf:
+ name:
+ - epel-release
+ state: present
+ when:
+ - ansible_facts['distribution_file_variety'] in ['RedHat', 'CentOS']
+ - ansible_facts['distribution_major_version'] == '8'
+
- name: Enable PowerTools repo on CentOS 8
ini_file:
path: /etc/yum.repos.d/CentOS-Stream-PowerTools.repo
@@ -148,6 +158,7 @@
name:
- bzip2
- bzip2-devel
+ - capstone-devel
- dbus-daemon
- diffutils
- gcc
--
2.38.1
