rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 838836 from home:bfrogers:branches:Virtualization

Browse Source 
- Undo part of the split-provides recently done. We have to wait on
  virt-manager to handle qemu modularization better before we make
  qemu-hw-display-qxl and qemu-hw-usb-redirect non-required
  (boo#1157320 boo#1176517)

OBS-URL: https://build.opensuse.org/request/show/838836
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=578
This commit is contained in:
Bruce Rogers 2020-09-30 21:00:36 +00:00 committed by Git OBS Bridge
parent 394e96ad3f
commit ed6a4f1b15
3 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qemu.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Sep 30 18:30:12 UTC 2020 - Bruce Rogers <brogers@suse.com>
- Undo part of the split-provides recently done. We have to wait on
virt-manager to handle qemu modularization better before we make
qemu-hw-display-qxl and qemu-hw-usb-redirect non-required
(boo#1157320 boo#1176517)
-------------------------------------------------------------------
Mon Sep 21 12:10:08 UTC 2020 - Bruce Rogers <brogers@suse.com>

33
qemu.spec
View File

@ -393,8 +393,8 @@ Requires(post): procps
Recommends: kvm_stat
%endif
Recommends: qemu-block-curl
Recommends: qemu-hw-display-qxl
Recommends: qemu-hw-usb-redirect
Requires: qemu-hw-display-qxl
Requires: qemu-hw-usb-redirect
Recommends: qemu-hw-usb-smartcard
Recommends: qemu-tools
Recommends: qemu-ui-curses
@ -696,7 +696,6 @@ Summary: QXL display support for QEMU
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Provides: %name:%_datadir/%name/forsplits/01
Provides: %name:%_docdir/%name/qemu-ga-ref.txt
%{qemu_module_conflicts}
@ -708,7 +707,6 @@ Summary: USB redirection support for QEMU
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Provides: %name:%_datadir/%name/forsplits/02
Provides: %name:%_docdir/%name/qemu-qmp-ref.html
%{qemu_module_conflicts}
@ -821,8 +819,9 @@ Release: 0
BuildArch: noarch
%description microvm
MicroVM (qboot) is a minimal x86 firmware for booting Linux kernel.
It provides the minimum resources needed to boot PVH and bzImages.
This package provides minimal x86 firmware for booting certain guests.
qboot based bios-microvm provides the minimum resources needed to boot PVH and
bzImages.
%package seabios
Summary: x86 Legacy BIOS for QEMU
@ -1615,13 +1614,10 @@ install -D -m 0644 %{SOURCE204} %{buildroot}%_docdir/%name/qemu-qmp-ref.html
install -D -m 0644 %{SOURCE205} %{buildroot}%_docdir/%name/qemu-qmp-ref.txt
mv %{buildroot}%_libexecdir/qemu-pr-helper %{buildroot}%_bindir/qemu-pr-helper
install -D -m 0644 %{SOURCE201} %{buildroot}%_datadir/%name/forsplits/pkg-split.txt
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/00
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/01
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/02
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/03
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/04
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/05
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/06
for X in 00 01 02 03 04 05 06 07 08 09
do
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/$X
done
%fdupes -s %{buildroot}
# ========================================================================
@ -1718,9 +1714,14 @@ fi
%dir %_datadir/%name/firmware
%dir %_datadir/%name/forsplits
%_datadir/%name/forsplits/pkg-split.txt
%_datadir/%name/forsplits/01
%_datadir/%name/forsplits/02
%_datadir/%name/forsplits/04
%_datadir/%name/forsplits/05
%_datadir/%name/forsplits/06
%_datadir/%name/forsplits/07
%_datadir/%name/forsplits/08
%_datadir/%name/forsplits/09
%_datadir/%name/keymaps
%_datadir/%name/qemu-ifup
%_datadir/%name/qemu-nsis.bmp
@ -2031,9 +2032,6 @@ fi
%files hw-display-qxl
%defattr(-, root, root)
%dir %_datadir/%name
%dir %_datadir/%name/forsplits
%_datadir/%name/forsplits/01
%dir %_docdir/%name
%_docdir/%name/qemu-ga-ref.txt
%dir %_libdir/%name
@ -2041,9 +2039,6 @@ fi
%files hw-usb-redirect
%defattr(-, root, root)
%dir %_datadir/%name
%dir %_datadir/%name/forsplits
%_datadir/%name/forsplits/02
%dir %_docdir/%name
%_docdir/%name/qemu-qmp-ref.html
%dir %_libdir/%name

33
qemu.spec.in
View File

@ -321,8 +321,8 @@ Requires(post): procps
Recommends: kvm_stat
%endif
Recommends: qemu-block-curl
Recommends: qemu-hw-display-qxl
Recommends: qemu-hw-usb-redirect
Requires: qemu-hw-display-qxl
Requires: qemu-hw-usb-redirect
Recommends: qemu-hw-usb-smartcard
Recommends: qemu-tools
Recommends: qemu-ui-curses
@ -625,7 +625,6 @@ Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Provides: %name:%_docdir/%name/qemu-ga-ref.txt
Provides: %name:%_datadir/%name/forsplits/01
%{qemu_module_conflicts}
%description hw-display-qxl
@ -637,7 +636,6 @@ Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
Provides: %name:%_docdir/%name/qemu-qmp-ref.html
Provides: %name:%_datadir/%name/forsplits/02
%{qemu_module_conflicts}
%description hw-usb-redirect
@ -749,8 +747,9 @@ Release: 0
BuildArch: noarch
%description microvm
MicroVM (qboot) is a minimal x86 firmware for booting Linux kernel.
It provides the minimum resources needed to boot PVH and bzImages.
This package provides minimal x86 firmware for booting certain guests.
qboot based bios-microvm provides the minimum resources needed to boot PVH and
bzImages.
%package seabios
Summary: x86 Legacy BIOS for QEMU
@ -1472,13 +1471,10 @@ install -D -m 0644 %{SOURCE204} %{buildroot}%_docdir/%name/qemu-qmp-ref.html
install -D -m 0644 %{SOURCE205} %{buildroot}%_docdir/%name/qemu-qmp-ref.txt
mv %{buildroot}%_libexecdir/qemu-pr-helper %{buildroot}%_bindir/qemu-pr-helper
install -D -m 0644 %{SOURCE201} %{buildroot}%_datadir/%name/forsplits/pkg-split.txt
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/00
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/01
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/02
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/03
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/04
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/05
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/06
for X in 00 01 02 03 04 05 06 07 08 09
do
ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/$X
done
%fdupes -s %{buildroot}
# ========================================================================
@ -1575,9 +1571,14 @@ fi
%dir %_datadir/%name/firmware
%dir %_datadir/%name/forsplits
%_datadir/%name/forsplits/pkg-split.txt
%_datadir/%name/forsplits/01
%_datadir/%name/forsplits/02
%_datadir/%name/forsplits/04
%_datadir/%name/forsplits/05
%_datadir/%name/forsplits/06
%_datadir/%name/forsplits/07
%_datadir/%name/forsplits/08
%_datadir/%name/forsplits/09
%_datadir/%name/keymaps
%_datadir/%name/qemu-ifup
%_datadir/%name/qemu-nsis.bmp
@ -1888,9 +1889,6 @@ fi
%files hw-display-qxl
%defattr(-, root, root)
%dir %_datadir/%name
%dir %_datadir/%name/forsplits
%_datadir/%name/forsplits/01
%dir %_docdir/%name
%_docdir/%name/qemu-ga-ref.txt
%dir %_libdir/%name
@ -1898,9 +1896,6 @@ fi
%files hw-usb-redirect
%defattr(-, root, root)
%dir %_datadir/%name
%dir %_datadir/%name/forsplits
%_datadir/%name/forsplits/02
%dir %_docdir/%name
%_docdir/%name/qemu-qmp-ref.html
%dir %_libdir/%name