Accepting request 850621 from home:bfrogers:branches:Virtualization
- Be more careful about what directives are used for qemu-testsuite OBS-URL: https://build.opensuse.org/request/show/850621 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=595
This commit is contained in:
Bruce Rogers
Git OBS Bridge
parent
5e0a4e0d00
commit
db17e9c477
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 24 21:24:59 UTC 2020 - Bruce Rogers <brogers@suse.com>
|
||||
|
||||
- Be more careful about what directives are used for qemu-testsuite
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 24 17:17:47 UTC 2020 - Bruce Rogers <brogers@suse.com>
|
||||
|
||||
|
||||
82
qemu.spec
82
qemu.spec
@ -350,44 +350,7 @@ BuildRequires: xfsprogs-devel
|
||||
BuildRequires: xz-devel
|
||||
%endif
|
||||
BuildRequires: zlib-devel
|
||||
%if "%{name}" == "qemu-testsuite"
|
||||
BuildRequires: bc
|
||||
BuildRequires: qemu-arm = %{qemuver}
|
||||
BuildRequires: qemu-audio-alsa = %{qemuver}
|
||||
BuildRequires: qemu-audio-pa = %{qemuver}
|
||||
BuildRequires: qemu-block-curl = %{qemuver}
|
||||
BuildRequires: qemu-block-dmg = %{qemuver}
|
||||
BuildRequires: qemu-block-gluster = %{qemuver}
|
||||
BuildRequires: qemu-block-iscsi = %{qemuver}
|
||||
BuildRequires: qemu-block-nfs = %{qemuver}
|
||||
%if 0%{?with_rbd}
|
||||
BuildRequires: qemu-block-rbd = %{qemuver}
|
||||
%endif
|
||||
BuildRequires: qemu-block-ssh = %{qemuver}
|
||||
BuildRequires: qemu-chardev-baum = %{qemuver}
|
||||
%if %{provide_edk2_firmware}
|
||||
BuildRequires: qemu-edk2 = %{qemuver}
|
||||
%endif
|
||||
BuildRequires: qemu-extra = %{qemuver}
|
||||
BuildRequires: qemu-guest-agent = %{qemuver}
|
||||
BuildRequires: qemu-hw-display-qxl = %{qemuver}
|
||||
BuildRequires: qemu-hw-usb-redirect = %{qemuver}
|
||||
BuildRequires: qemu-hw-usb-smartcard = %{qemuver}
|
||||
BuildRequires: qemu-ipxe = 1.0.0+
|
||||
BuildRequires: qemu-ksm = %{qemuver}
|
||||
BuildRequires: qemu-lang = %{qemuver}
|
||||
BuildRequires: qemu-ppc = %{qemuver}
|
||||
BuildRequires: qemu-s390 = %{qemuver}
|
||||
BuildRequires: qemu-seabios = %{sbver}
|
||||
BuildRequires: qemu-sgabios = 8
|
||||
BuildRequires: qemu-skiboot = %{qemuver}
|
||||
BuildRequires: qemu-tools = %{qemuver}
|
||||
BuildRequires: qemu-ui-curses = %{qemuver}
|
||||
BuildRequires: qemu-ui-gtk = %{qemuver}
|
||||
BuildRequires: qemu-ui-spice-app = %{qemuver}
|
||||
BuildRequires: qemu-vgabios = %{sbver}
|
||||
BuildRequires: qemu-x86 = %{qemuver}
|
||||
%endif
|
||||
%if "%{name}" == "qemu"
|
||||
Requires: group(kvm)
|
||||
Requires: group(qemu)
|
||||
Requires: user(qemu)
|
||||
@ -455,8 +418,6 @@ virtualization.
|
||||
|
||||
This package acts as an umbrella package to the other QEMU sub-packages.
|
||||
|
||||
%if "%{name}" != "qemu-testsuite"
|
||||
|
||||
%package x86
|
||||
Summary: Machine emulator and virtualizer for x86 architectures
|
||||
Group: System/Emulators/PC
|
||||
@ -906,6 +867,47 @@ merges anonymous (private) pages (not pagecache ones).
|
||||
|
||||
This package provides a service file for starting and stopping KSM.
|
||||
|
||||
%else #qemu
|
||||
BuildRequires: bc
|
||||
BuildRequires: qemu-arm = %{qemuver}
|
||||
BuildRequires: qemu-audio-alsa = %{qemuver}
|
||||
BuildRequires: qemu-audio-pa = %{qemuver}
|
||||
BuildRequires: qemu-block-curl = %{qemuver}
|
||||
BuildRequires: qemu-block-dmg = %{qemuver}
|
||||
BuildRequires: qemu-block-gluster = %{qemuver}
|
||||
BuildRequires: qemu-block-iscsi = %{qemuver}
|
||||
BuildRequires: qemu-block-nfs = %{qemuver}
|
||||
%if 0%{?with_rbd}
|
||||
BuildRequires: qemu-block-rbd = %{qemuver}
|
||||
%endif
|
||||
BuildRequires: qemu-block-ssh = %{qemuver}
|
||||
BuildRequires: qemu-chardev-baum = %{qemuver}
|
||||
%if %{provide_edk2_firmware}
|
||||
BuildRequires: qemu-edk2 = %{qemuver}
|
||||
%endif
|
||||
BuildRequires: qemu-extra = %{qemuver}
|
||||
BuildRequires: qemu-guest-agent = %{qemuver}
|
||||
BuildRequires: qemu-hw-display-qxl = %{qemuver}
|
||||
BuildRequires: qemu-hw-usb-redirect = %{qemuver}
|
||||
BuildRequires: qemu-hw-usb-smartcard = %{qemuver}
|
||||
BuildRequires: qemu-ipxe = 1.0.0+
|
||||
BuildRequires: qemu-ksm = %{qemuver}
|
||||
BuildRequires: qemu-lang = %{qemuver}
|
||||
BuildRequires: qemu-ppc = %{qemuver}
|
||||
BuildRequires: qemu-s390 = %{qemuver}
|
||||
BuildRequires: qemu-seabios = %{sbver}
|
||||
BuildRequires: qemu-sgabios = 8
|
||||
BuildRequires: qemu-skiboot = %{qemuver}
|
||||
BuildRequires: qemu-tools = %{qemuver}
|
||||
BuildRequires: qemu-ui-curses = %{qemuver}
|
||||
BuildRequires: qemu-ui-gtk = %{qemuver}
|
||||
BuildRequires: qemu-ui-spice-app = %{qemuver}
|
||||
BuildRequires: qemu-vgabios = %{sbver}
|
||||
BuildRequires: qemu-x86 = %{qemuver}
|
||||
|
||||
%description
|
||||
This package records qemu testsuite results and represents successful testing.
|
||||
|
||||
%endif # ! qemu-testsuite
|
||||
%endif # ! qemu-linux-user
|
||||
|
||||
|
||||
82
qemu.spec.in
82
qemu.spec.in
@ -276,44 +276,7 @@ BuildRequires: xfsprogs-devel
|
||||
BuildRequires: xz-devel
|
||||
%endif
|
||||
BuildRequires: zlib-devel
|
||||
%if "%{name}" == "qemu-testsuite"
|
||||
BuildRequires: bc
|
||||
BuildRequires: qemu-arm = %{qemuver}
|
||||
BuildRequires: qemu-audio-alsa = %{qemuver}
|
||||
BuildRequires: qemu-audio-pa = %{qemuver}
|
||||
BuildRequires: qemu-block-curl = %{qemuver}
|
||||
BuildRequires: qemu-block-dmg = %{qemuver}
|
||||
BuildRequires: qemu-block-gluster = %{qemuver}
|
||||
BuildRequires: qemu-block-iscsi = %{qemuver}
|
||||
BuildRequires: qemu-block-nfs = %{qemuver}
|
||||
%if 0%{?with_rbd}
|
||||
BuildRequires: qemu-block-rbd = %{qemuver}
|
||||
%endif
|
||||
BuildRequires: qemu-block-ssh = %{qemuver}
|
||||
BuildRequires: qemu-chardev-baum = %{qemuver}
|
||||
%if %{provide_edk2_firmware}
|
||||
BuildRequires: qemu-edk2 = %{qemuver}
|
||||
%endif
|
||||
BuildRequires: qemu-extra = %{qemuver}
|
||||
BuildRequires: qemu-guest-agent = %{qemuver}
|
||||
BuildRequires: qemu-hw-display-qxl = %{qemuver}
|
||||
BuildRequires: qemu-hw-usb-redirect = %{qemuver}
|
||||
BuildRequires: qemu-hw-usb-smartcard = %{qemuver}
|
||||
BuildRequires: qemu-ipxe = 1.0.0+
|
||||
BuildRequires: qemu-ksm = %{qemuver}
|
||||
BuildRequires: qemu-lang = %{qemuver}
|
||||
BuildRequires: qemu-ppc = %{qemuver}
|
||||
BuildRequires: qemu-s390 = %{qemuver}
|
||||
BuildRequires: qemu-seabios = %{sbver}
|
||||
BuildRequires: qemu-sgabios = 8
|
||||
BuildRequires: qemu-skiboot = %{qemuver}
|
||||
BuildRequires: qemu-tools = %{qemuver}
|
||||
BuildRequires: qemu-ui-curses = %{qemuver}
|
||||
BuildRequires: qemu-ui-gtk = %{qemuver}
|
||||
BuildRequires: qemu-ui-spice-app = %{qemuver}
|
||||
BuildRequires: qemu-vgabios = %{sbver}
|
||||
BuildRequires: qemu-x86 = %{qemuver}
|
||||
%endif
|
||||
%if "%{name}" == "qemu"
|
||||
Requires: group(kvm)
|
||||
Requires: group(qemu)
|
||||
Requires: user(qemu)
|
||||
@ -381,8 +344,6 @@ virtualization.
|
||||
|
||||
This package acts as an umbrella package to the other QEMU sub-packages.
|
||||
|
||||
%if "%{name}" != "qemu-testsuite"
|
||||
|
||||
%package x86
|
||||
Summary: Machine emulator and virtualizer for x86 architectures
|
||||
Group: System/Emulators/PC
|
||||
@ -832,6 +793,47 @@ merges anonymous (private) pages (not pagecache ones).
|
||||
|
||||
This package provides a service file for starting and stopping KSM.
|
||||
|
||||
%else # qemu
|
||||
BuildRequires: bc
|
||||
BuildRequires: qemu-arm = %{qemuver}
|
||||
BuildRequires: qemu-audio-alsa = %{qemuver}
|
||||
BuildRequires: qemu-audio-pa = %{qemuver}
|
||||
BuildRequires: qemu-block-curl = %{qemuver}
|
||||
BuildRequires: qemu-block-dmg = %{qemuver}
|
||||
BuildRequires: qemu-block-gluster = %{qemuver}
|
||||
BuildRequires: qemu-block-iscsi = %{qemuver}
|
||||
BuildRequires: qemu-block-nfs = %{qemuver}
|
||||
%if 0%{?with_rbd}
|
||||
BuildRequires: qemu-block-rbd = %{qemuver}
|
||||
%endif
|
||||
BuildRequires: qemu-block-ssh = %{qemuver}
|
||||
BuildRequires: qemu-chardev-baum = %{qemuver}
|
||||
%if %{provide_edk2_firmware}
|
||||
BuildRequires: qemu-edk2 = %{qemuver}
|
||||
%endif
|
||||
BuildRequires: qemu-extra = %{qemuver}
|
||||
BuildRequires: qemu-guest-agent = %{qemuver}
|
||||
BuildRequires: qemu-hw-display-qxl = %{qemuver}
|
||||
BuildRequires: qemu-hw-usb-redirect = %{qemuver}
|
||||
BuildRequires: qemu-hw-usb-smartcard = %{qemuver}
|
||||
BuildRequires: qemu-ipxe = 1.0.0+
|
||||
BuildRequires: qemu-ksm = %{qemuver}
|
||||
BuildRequires: qemu-lang = %{qemuver}
|
||||
BuildRequires: qemu-ppc = %{qemuver}
|
||||
BuildRequires: qemu-s390 = %{qemuver}
|
||||
BuildRequires: qemu-seabios = %{sbver}
|
||||
BuildRequires: qemu-sgabios = 8
|
||||
BuildRequires: qemu-skiboot = %{qemuver}
|
||||
BuildRequires: qemu-tools = %{qemuver}
|
||||
BuildRequires: qemu-ui-curses = %{qemuver}
|
||||
BuildRequires: qemu-ui-gtk = %{qemuver}
|
||||
BuildRequires: qemu-ui-spice-app = %{qemuver}
|
||||
BuildRequires: qemu-vgabios = %{sbver}
|
||||
BuildRequires: qemu-x86 = %{qemuver}
|
||||
|
||||
%description
|
||||
This package records qemu testsuite results and represents successful testing.
|
||||
|
||||
%endif # ! qemu-testsuite
|
||||
%endif # ! qemu-linux-user
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user