From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: crosa@redhat.com
Subject: [PATCH 3/5] scripts/ci: add capstone development packages
Date: Thu, 19 Jan 2023 16:41:43 +0100 [thread overview]
Message-ID: <20230119154145.471156-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20230119154145.471156-1-pbonzini@redhat.com>
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 <pbonzini@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
next prev parent reply other threads:[~2023-01-19 15:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 15:41 [PATCH 0/5] scripts/ci: update build environment playbooks Paolo Bonzini
2023-01-19 15:41 ` [PATCH 1/5] scripts/ci: remove unnecessary checks from CentOS playbook Paolo Bonzini
2023-01-19 15:41 ` [PATCH 2/5] scripts/ci: support CentOS Stream 8 in build-environment.yaml Paolo Bonzini
2023-01-19 15:41 ` Paolo Bonzini [this message]
2023-01-19 15:41 ` [PATCH 4/5] scripts/ci: unify package lists for CentOS in build-environment files Paolo Bonzini
2023-01-19 15:41 ` [PATCH 5/5] scripts/ci: bump CentOS Python to 3.8 Paolo Bonzini
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=20230119154145.471156-4-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=crosa@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).