From f9f98ca55dae3e5897d971e189a476c66743084a78588715481564b38de16989 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Tue, 17 Nov 2020 16:14:12 +0000 Subject: [PATCH] Accepting request 849129 from home:bfrogers:branches:Virtualization - A patch has been applied to virt-manager to handle qemu spice related modules not being present, so undo the change from Sep 30, 2020. Once again qemu-hw-display-qxl and qemu-hw-usb-redirect are Recommends and not Required by the qemu package (boo#1157320 boo#1176517, boo#1178141) - For jsc#SLE-11629, change qemu, qemu-tools, and qemu-guest-agent to rely on system-user-qemu and system-group-kvm to provide now static system UIDs and GID's for qemu user and group, and kvm group. This will make guest migration more seamless for new installations since there is no chance of having required ID's differ in value. OBS-URL: https://build.opensuse.org/request/show/849129 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=589 --- bundles.tar.xz | 4 ++-- qemu.changes | 15 +++++++++++++++ qemu.spec | 33 +++++++++++++++++---------------- qemu.spec.in | 33 +++++++++++++++++---------------- 4 files changed, 51 insertions(+), 34 deletions(-) diff --git a/bundles.tar.xz b/bundles.tar.xz index 8046a1e7..b655d886 100644 --- a/bundles.tar.xz +++ b/bundles.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8c033ad0591f42ffbdd2f4f151592dc7aa0f14f98b991623667620b6fcff7382 -size 41756 +oid sha256:9544eda1805358a45c48f47fa30a2759ccc79bbfb4f35ac3b4644d228db99858 +size 38124 diff --git a/qemu.changes b/qemu.changes index 0acf8131..703cd874 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Nov 17 01:41:49 UTC 2020 - Bruce Rogers + +- A patch has been applied to virt-manager to handle qemu spice + related modules not being present, so undo the change from Sep + 30, 2020. Once again qemu-hw-display-qxl and qemu-hw-usb-redirect + are Recommends and not Required by the qemu package + (boo#1157320 boo#1176517, boo#1178141) +- For jsc#SLE-11629, change qemu, qemu-tools, and qemu-guest-agent + to rely on system-user-qemu and system-group-kvm to provide now + static system UIDs and GID's for qemu user and group, and kvm + group. This will make guest migration more seamless for new + installations since there is no chance of having required ID's + differ in value. + ------------------------------------------------------------------- Wed Nov 4 16:40:36 UTC 2020 - Liang Yan diff --git a/qemu.spec b/qemu.spec index d8900ec8..a4d9ed6a 100644 --- a/qemu.spec +++ b/qemu.spec @@ -380,7 +380,10 @@ BuildRequires: qemu-ui-spice-app = %{qemuver} BuildRequires: qemu-vgabios = %{sbver} BuildRequires: qemu-x86 = %{qemuver} %endif +Requires(pre): group(kvm) +Requires(pre): group(qemu) Requires(pre): shadow +Requires(pre): user(qemu) Requires(post): coreutils %if %{kvm_available} Requires(post): acl @@ -391,8 +394,8 @@ Requires(post): procps Recommends: kvm_stat %endif Recommends: qemu-block-curl -Requires: qemu-hw-display-qxl -Requires: qemu-hw-usb-redirect +Recommends: qemu-hw-display-qxl +Recommends: qemu-hw-usb-redirect Recommends: qemu-hw-usb-smartcard Recommends: qemu-tools Recommends: qemu-ui-curses @@ -686,6 +689,7 @@ 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} @@ -697,6 +701,7 @@ 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} @@ -761,6 +766,7 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Provides: %name:%_libexecdir/qemu-bridge-helper +Requires(pre): group(kvm) Requires(pre): permissions Requires(pre): shadow Recommends: multipath-tools @@ -779,6 +785,7 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Provides: %name:%_bindir/qemu-ga +Requires(pre): group(kvm) Requires(pre): shadow Requires(post): udev Supplements: modalias(acpi*:QEMU0002%3A*) @@ -1617,21 +1624,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -s -f %{_sysconfdir}/alternatives/skiboot.lid %{buildroot}%{_datadir}/%name/skiboot.lid install -D -m 0644 %{SOURCE201} %{buildroot}%_datadir/%name/forsplits/pkg-split.txt -for X in 00 01 02 03 04 05 06 07 08 09 10 11 12 +for X in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 do ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/$X done %fdupes -s %{buildroot} # ======================================================================== -# (qemu alone has pre* and post* sections for itself and subpackages): - -%pre -%_bindir/getent group kvm >/dev/null || %_sbindir/groupadd -r kvm -%_bindir/getent group qemu >/dev/null || %_sbindir/groupadd -r qemu -%_bindir/getent passwd qemu >/dev/null || - %_sbindir/useradd -r -g qemu -G kvm -d / -s /sbin/nologin \ - -c "qemu user" qemu %if %{kvm_available} %post @@ -1652,8 +1651,6 @@ if [ $(stat -L -c "%i" /proc/1/root/) = $(stat -L -c "%i" /) ]; then fi %endif -%pre tools -%_bindir/getent group kvm >/dev/null || %_sbindir/groupadd -r kvm %post tools %set_permissions %_libexecdir/qemu-bridge-helper @@ -1661,7 +1658,6 @@ fi %verify_permissions %_libexecdir/qemu-bridge-helper %pre guest-agent -%_bindir/getent group kvm >/dev/null || %_sbindir/groupadd -r kvm %service_add_pre qemu-ga@.service %post guest-agent @@ -1726,8 +1722,6 @@ 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/07 @@ -1736,6 +1730,7 @@ fi %_datadir/%name/forsplits/10 %_datadir/%name/forsplits/11 %_datadir/%name/forsplits/12 +%_datadir/%name/forsplits/13 %_datadir/%name/keymaps %_datadir/%name/qemu-ifup %_datadir/%name/qemu-nsis.bmp @@ -2040,6 +2035,9 @@ 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 @@ -2047,6 +2045,9 @@ 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 diff --git a/qemu.spec.in b/qemu.spec.in index 7a30d181..9ebb1007 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -306,7 +306,10 @@ BuildRequires: qemu-ui-spice-app = %{qemuver} BuildRequires: qemu-vgabios = %{sbver} BuildRequires: qemu-x86 = %{qemuver} %endif +Requires(pre): group(kvm) +Requires(pre): group(qemu) Requires(pre): shadow +Requires(pre): user(qemu) Requires(post): coreutils %if %{kvm_available} Requires(post): acl @@ -317,8 +320,8 @@ Requires(post): procps Recommends: kvm_stat %endif Recommends: qemu-block-curl -Requires: qemu-hw-display-qxl -Requires: qemu-hw-usb-redirect +Recommends: qemu-hw-display-qxl +Recommends: qemu-hw-usb-redirect Recommends: qemu-hw-usb-smartcard Recommends: qemu-tools Recommends: qemu-ui-curses @@ -612,6 +615,7 @@ 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} @@ -623,6 +627,7 @@ 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} @@ -687,6 +692,7 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Provides: %name:%_libexecdir/qemu-bridge-helper +Requires(pre): group(kvm) Requires(pre): permissions Requires(pre): shadow Recommends: multipath-tools @@ -705,6 +711,7 @@ Group: System/Emulators/PC Version: %{qemuver} Release: 0 Provides: %name:%_bindir/qemu-ga +Requires(pre): group(kvm) Requires(pre): shadow Requires(post): udev Supplements: modalias(acpi*:QEMU0002%3A*) @@ -1470,21 +1477,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/alternatives ln -s -f %{_sysconfdir}/alternatives/skiboot.lid %{buildroot}%{_datadir}/%name/skiboot.lid install -D -m 0644 %{SOURCE201} %{buildroot}%_datadir/%name/forsplits/pkg-split.txt -for X in 00 01 02 03 04 05 06 07 08 09 10 11 12 +for X in 00 01 02 03 04 05 06 07 08 09 10 11 12 13 do ln -s pkg-split.txt %{buildroot}%_datadir/%name/forsplits/$X done %fdupes -s %{buildroot} # ======================================================================== -# (qemu alone has pre* and post* sections for itself and subpackages): - -%pre -%_bindir/getent group kvm >/dev/null || %_sbindir/groupadd -r kvm -%_bindir/getent group qemu >/dev/null || %_sbindir/groupadd -r qemu -%_bindir/getent passwd qemu >/dev/null || - %_sbindir/useradd -r -g qemu -G kvm -d / -s /sbin/nologin \ - -c "qemu user" qemu %if %{kvm_available} %post @@ -1505,8 +1504,6 @@ if [ $(stat -L -c "%i" /proc/1/root/) = $(stat -L -c "%i" /) ]; then fi %endif -%pre tools -%_bindir/getent group kvm >/dev/null || %_sbindir/groupadd -r kvm %post tools %set_permissions %_libexecdir/qemu-bridge-helper @@ -1514,7 +1511,6 @@ fi %verify_permissions %_libexecdir/qemu-bridge-helper %pre guest-agent -%_bindir/getent group kvm >/dev/null || %_sbindir/groupadd -r kvm %service_add_pre qemu-ga@.service %post guest-agent @@ -1579,8 +1575,6 @@ 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/07 @@ -1589,6 +1583,7 @@ fi %_datadir/%name/forsplits/10 %_datadir/%name/forsplits/11 %_datadir/%name/forsplits/12 +%_datadir/%name/forsplits/13 %_datadir/%name/keymaps %_datadir/%name/qemu-ifup %_datadir/%name/qemu-nsis.bmp @@ -1893,6 +1888,9 @@ 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 @@ -1900,6 +1898,9 @@ 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