rpms/qemu
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable static user mode build on RHEL

Browse Source 
The ELN stream builds Fedora packages in a psuedo-RHEL build root and
does not ship all the things that Fedora expects to be present. In
particular glib2-static is missing in ELN build roots, so we need to
disable the user mode static build.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-11-13 11:23:23 +00:00
parent 3f5e1104a8
commit 0b61e57fbe
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qemu.spec
View File

@ -25,6 +25,9 @@
%endif %endif
%global user_static 1 %global user_static 1
%if 0%{?rhel}
%global user_static 0
%endif
%global have_kvm 0 %global have_kvm 0
%if 0%{?kvm_package:1} %if 0%{?kvm_package:1}
@ -213,7 +216,7 @@
Summary: QEMU is a FAST! processor emulator Summary: QEMU is a FAST! processor emulator
Name: qemu Name: qemu
Version: 5.2.0 Version: 5.2.0
Release: 0.2%{?rcrel}%{?dist} Release: 0.3%{?rcrel}%{?dist}
Epoch: 2 Epoch: 2
License: GPLv2 and BSD and MIT and CC-BY License: GPLv2 and BSD and MIT and CC-BY
URL: http://www.qemu.org/ URL: http://www.qemu.org/
@ -378,7 +381,9 @@ BuildRequires: daxctl-devel
# used by some linux user impls # used by some linux user impls
BuildRequires: libdrm-devel BuildRequires: libdrm-devel
%if %{user_static}
BuildRequires: glibc-static pcre-static glib2-static zlib-static BuildRequires: glibc-static pcre-static glib2-static zlib-static
%endif
Requires: %{name}-user = %{epoch}:%{version}-%{release} Requires: %{name}-user = %{epoch}:%{version}-%{release}
@ -1903,6 +1908,9 @@ getent passwd qemu >/dev/null || \
%changelog %changelog
* Fri Nov 13 2020 Daniel P. Berrangé <berrange@redhat.com> - 5.2.0-0.3.rc1
- Disable user mode static builds in ELN
* Wed Nov 11 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.2.rc1 * Wed Nov 11 2020 Cole Robinson <aintdiscole@gmail.com> - 5.2.0-0.2.rc1
- Rebase to qemu-5.2.0-rc1 - Rebase to qemu-5.2.0-rc1