diff --git a/qemu-kvm.spec b/qemu-kvm.spec index 9743d6ebf7fd1ff5e011b0a6b303563b8b01a28e..164ca958c4b689165c4bc153f0d8ac8a0df9821e 100644 --- a/qemu-kvm.spec +++ b/qemu-kvm.spec @@ -88,7 +88,7 @@ Obsoletes: %1-rhev <= %{epoch}:%{version}-%{release} Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 6.2.0 -Release: 11%{?rcrel}%{anolis_release}%{?dist}.6 +Release: 11%{?rcrel}%{anolis_release}%{?dist}.7 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped Epoch: 15 License: GPLv2 and GPLv2+ and CC-BY @@ -485,6 +485,8 @@ BuildRequires: pkgconfig(gbm) BuildRequires: perl-Test-Harness +BuildRequires: glibc-static pcre-static glib2-static zlib-static + Requires: qemu-kvm-core = %{epoch}:%{version}-%{release} Requires: qemu-kvm-docs = %{epoch}:%{version}-%{release} %rhev_ma_conflicts qemu-kvm @@ -697,6 +699,14 @@ This package provides usbredir support. %endif +%package -n qemu-user-static +Summary: QEMU user mode emulation of qemu targets static build +%description -n qemu-user-static +This package provides the user mode emulation of qemu targets built as +static binaries + + + %prep %setup -q -n qemu-%{version}%{?rcstr} # Remove slirp content in scratchbuilds because it's being applyed as a patch @@ -714,6 +724,11 @@ cp -f %{SOURCE38} tests/data/acpi/q35/FACP.slic cp -f %{SOURCE39} tests/data/acpi/q35/SSDT.dimmpxm cp -f %{SOURCE40} tests/data/acpi/virt/SSDT.memhp +%global static_builddir static_builddir +mkdir -p %{static_builddir} + + + %build %global buildarch %{kvm_target}-softmmu @@ -989,6 +1004,22 @@ gcc %{SOURCE35} $RPM_OPT_FLAGS $RPM_LD_FLAGS -o udev-kvm-check popd +pushd %{static_builddir} + +../configure \ + %{disable_everything} \ + --enable-docs \ + --enable-attr \ + --enable-tcg \ + --enable-linux-user \ + --target-list=%{kvm_target}-linux-user \ + --static + +make -j + +popd + + %install pushd %{qemu_kvm_build} %define _udevdir %(pkg-config --variable=udevdir udev) @@ -1297,6 +1328,12 @@ rm -rf $RPM_BUILD_ROOT%{qemudocdir}/specs popd +# Install qemu-user-static +pushd %{static_builddir} +mkdir -p $RPM_BUILD_ROOT%{_bindir}/ +install -p -m 755 qemu-%{kvm_target} $RPM_BUILD_ROOT%{_bindir}/qemu-%{kvm_target}-static +popd + %check %ifnarch loongarch64 pushd %{qemu_kvm_build} @@ -1558,8 +1595,14 @@ sh %{_sysconfdir}/sysconfig/modules/kvm.modules &> /dev/null || : %{_libdir}/qemu-kvm/hw-usb-redirect.so %endif +%files -n qemu-user-static +%{_bindir}/qemu-%{kvm_target}-static + %changelog +* Mon Jan 30 2023 Wu Hao - 6.2.0-11.0.1.7 +- Add package qemu-user-static + * Fri Oct 28 2022 Bo Ren - 6.2.0-11.0.1.6 - Adjust limit for virtiofsd minor version (jacob.wang@openanolis.org) - Add loongarch supporti (lixianglai@loongson.cn)