#28 Unconditionally enable capstone-devel
Merged 2 years ago by crobinso. Opened 2 years ago by dcavalca.
rpms/ dcavalca/qemu capstone  into  rawhide

file modified
+4 -10
@@ -144,13 +144,6 @@ 

  %define have_block_nfs 1

  %endif

  

- %define have_capstone_devel 0

- %if 0%{?fedora}

- # capstone-devel is only on Fedora. Use it if it's available, but

- # if not, use the internal qemu submodule copy

- %define have_capstone_devel 1

- %endif

- 

  %define have_librdma 1

  %ifarch %{arm}

  %define have_librdma 0
@@ -317,7 +310,7 @@ 

  %endif

  

  # To prevent rpmdev-bumpspec breakage

- %global baserelease 2

+ %global baserelease 3

  

  Summary: QEMU is a FAST! processor emulator

  Name: qemu
@@ -464,10 +457,8 @@ 

  # virgl 3d support

  BuildRequires: virglrenderer-devel

  %endif

- %if %{have_capstone_devel}

  # preferred disassembler for TCG

  BuildRequires: capstone-devel

- %endif

  # qemu-ga

  BuildRequires: libudev-devel

  # qauth infrastructure
@@ -2750,6 +2741,9 @@ 

  

  

  %changelog

+ - Thu Sep 08 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 7.1.0-3

+ - Unconditionally enable capstone-devel

+ 

  - Thu Sep 08 2022 Davide Cavalca <dcavalca@fedoraproject.org> - 7.1.0-2

  - Bump required meson version

  

capstone-devel is available on RHEL as well these days (currently via EPEL, and soon via RHEL proper per https://bugzilla.redhat.com/show_bug.cgi?id=2124181) so it makes sense to just enable it unconditionally. Moreoever, if it isn't enabled the build currently breaks because qemu doesn't ship an internal submodule for it anymore.

Agreed, I mentioned this to @etrunko too. Can you change this to drop the have_capstone_devel macro entirely

I'm curious, are you trying qemu builds on RHEL/centos as a one off? EPEL? something else? FWIW virt-preview aims to have centos stream9 qemu builds, though they are currently not avaiable due to this issue. https://copr.fedorainfracloud.org/coprs/g/virtmaint-sig/virt-preview/

Thanks! I will get this updated in a minute.

Right now I'm looking at building qemu within the CentOS Hyperscale SIG: https://git.centos.org/rpms/qemu/commits/c8s-sig-hyperscale (that's the c8s branch, but the idea is to build this for both c8s and c9s). The idea is to use this as a staging ground for a future EPEL package (https://bugzilla.redhat.com/show_bug.cgi?id=1995353) and at the same time to aid in testing and upstreaming some QEMU changes one of the SIG members (Meta) is working on. I would like to keep the deviation from the Fedora packaging as small as possible, so you'll likely see more PRs from us in the coming weeks.

rebased onto 92a8731

2 years ago

Updated to drop the macro altogether

Sounds good, thanks. We will keep an eye out for more PRs :)

Pull-Request has been merged by crobinso

2 years ago

Build succeeded.

Metadata