Hello community,
here is the log from the commit of package qemu for openSUSE:Factory checked in
at 2020-10-10 19:01:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qemu (Old)
and /work/SRC/openSUSE:Factory/.qemu.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qemu"
Sat Oct 10 19:01:09 2020 rev:184 rq:840111 version:5.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qemu/qemu.changes 2020-10-02
17:15:40.170080735 +0200
+++ /work/SRC/openSUSE:Factory/.qemu.new.4249/qemu.changes 2020-10-10
19:01:26.680396540 +0200
@@ -1,0 +2,9 @@
+Wed Oct 7 13:34:49 UTC 2020 - Bruce Rogers <brog...@suse.com>
+
+- Create qemu-skiboot sub-package. Use update-alternatives mechanism
+ to coordinate with opal-firmware (provided with skiboot package set)
+ on the provider of the /usr/share/qemu/skiboot.lid firmware file.
+ qemu-skiboot uses a priority of 15, while opal-firmware uses a
+ priority of 10 (jsc#SLE-13240)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qemu.spec ++++++
--- /var/tmp/diff_new_pack.hECaZI/_old 2020-10-10 19:01:31.808399085 +0200
+++ /var/tmp/diff_new_pack.hECaZI/_new 2020-10-10 19:01:31.812399087 +0200
@@ -374,6 +374,7 @@
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}
@@ -427,6 +428,7 @@
Suggests: qemu-block-ssh
Suggests: qemu-chardev-baum
Suggests: qemu-extra
+Suggests: qemu-skiboot
Suggests: qemu-lang
Recommends: qemu-ksm = %{qemuver}
Suggests: qemu-microvm
@@ -517,6 +519,7 @@
Requires: %name = %{qemuver}
Recommends: qemu-ipxe
Recommends: qemu-vgabios
+Recommends: qemu-skiboot
%description extra
%{generic_qemu_description}
@@ -886,6 +889,20 @@
Provides EDK II based firmware.
%endif
+%package skiboot
+Summary: OPAL firmware (aka skiboot), used in booting OpenPOWER systems
+Group: System/Emulators/PC
+Version: %{qemuver}
+Release: 0
+BuildArch: noarch
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+Provides: %name:%_datadir/%name/forsplits/06
+
+%description skiboot
+Provides OPAL (OpenPower Abstraction Layer) firmware, aka skiboot, as
+traditionally packaged with QEMU.
+
%package ksm
Summary: Kernel Samepage Merging services
Group: System/Emulators/PC
@@ -1613,6 +1630,13 @@
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
+
+# in support of update-alternatives
+mv %{buildroot}%_datadir/%name/skiboot.lid
%{buildroot}%_datadir/%name/skiboot.lid.qemu
+# create a dummy target for /etc/alternatives/skiboot.lid
+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
do
@@ -1687,6 +1711,15 @@
%postun ksm
%service_del_postun ksm.service
+%post skiboot
+update-alternatives --install \
+ %{_datadir}/%name/skiboot.lid skiboot.lid
%{_datadir}/%name/skiboot.lid.qemu 15
+
+%postun skiboot
+if [ ! -f %{_datadir}/%name/skiboot.lid.qemu ] ; then
+ update-alternatives --remove skiboot.lid %{_datadir}/%name/skiboot.lid.qemu
+fi
+
%endif # qemu
# ========================================================================
@@ -1718,7 +1751,6 @@
%_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
@@ -1894,7 +1926,6 @@
%_datadir/%name/canyonlands.dtb
%_datadir/%name/openbios-ppc
%_datadir/%name/qemu_vga.ndrv
-%_datadir/%name/skiboot.lid
%_datadir/%name/slof.bin
%_datadir/%name/u-boot.e500
%_datadir/%name/u-boot-sam460-20100605.bin
@@ -2150,6 +2181,15 @@
%endif
%endif
+%files skiboot
+%defattr(-, root, root)
+%dir %_datadir/%name
+%dir %_datadir/%name/forsplits
+%_datadir/%name/forsplits/06
+%_datadir/%name/skiboot.lid
+%_datadir/%name/skiboot.lid.qemu
+%ghost %_sysconfdir/alternatives/skiboot.lid
+
%files vhost-user-gpu
%defattr(-, root, root)
%dir %_datadir/%name/vhost-user
++++++ bundles.tar.xz ++++++
Binary files old/d0ed6a69d399ae193959225cdeaa9382746c91cc.bundle and
new/d0ed6a69d399ae193959225cdeaa9382746c91cc.bundle differ
Binary files old/roms/ipxe/de4565cbe76ea9f7913a01f331be3ee901bb6e17.bundle and
new/roms/ipxe/de4565cbe76ea9f7913a01f331be3ee901bb6e17.bundle differ
Binary files old/roms/seabios/d9c812dda519a1a73e8370e1b81ddf46eb22ed16.bundle
and new/roms/seabios/d9c812dda519a1a73e8370e1b81ddf46eb22ed16.bundle differ
++++++ qemu.spec.in ++++++
--- /var/tmp/diff_new_pack.hECaZI/_old 2020-10-10 19:01:32.284399322 +0200
+++ /var/tmp/diff_new_pack.hECaZI/_new 2020-10-10 19:01:32.284399322 +0200
@@ -229,21 +229,21 @@
%if 0%{?with_rbd}
BuildRequires: librbd-devel
%endif
+BuildRequires: Mesa-devel
BuildRequires: libSDL2-devel
BuildRequires: libSDL2_image-devel
BuildRequires: libseccomp-devel >= 2.3.0
BuildRequires: libslirp-devel >= 4.2.0
BuildRequires: libspice-server-devel >= 0.12.5
BuildRequires: libssh-devel >= 0.8
-BuildRequires: pkgconfig(libudev)
BuildRequires: libusb-1_0-devel >= 1.0.13
BuildRequires: libvdeplug-devel
-BuildRequires: lzfse-devel
-BuildRequires: Mesa-devel
BuildRequires: libxkbcommon-devel
+BuildRequires: lzfse-devel
BuildRequires: lzo-devel
BuildRequires: makeinfo
BuildRequires: multipath-tools-devel
+BuildRequires: pkgconfig(libudev)
%if %{build_x86_firmware_from_source}
BuildRequires: nasm
%endif
@@ -302,6 +302,7 @@
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}
@@ -355,6 +356,7 @@
Suggests: qemu-block-ssh
Suggests: qemu-chardev-baum
Suggests: qemu-extra
+Suggests: qemu-skiboot
Suggests: qemu-lang
Recommends: qemu-ksm = %{qemuver}
Suggests: qemu-microvm
@@ -445,6 +447,7 @@
Requires: %name = %{qemuver}
Recommends: qemu-ipxe
Recommends: qemu-vgabios
+Recommends: qemu-skiboot
%description extra
%{generic_qemu_description}
@@ -612,8 +615,8 @@
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
-Provides: %name:%_docdir/%name/qemu-ga-ref.html
Provides: %name:%_datadir/%name/forsplits/00
+Provides: %name:%_docdir/%name/qemu-ga-ref.html
%{qemu_module_conflicts}
%description chardev-baum
@@ -646,8 +649,8 @@
Group: System/Emulators/PC
Version: %{qemuver}
Release: 0
-Provides: %name:%_docdir/%name/qemu-qmp-ref.txt
Provides: %name:%_datadir/%name/forsplits/03
+Provides: %name:%_docdir/%name/qemu-qmp-ref.txt
%{qemu_module_conflicts}
%description hw-usb-smartcard
@@ -814,6 +817,20 @@
Provides EDK II based firmware.
%endif
+%package skiboot
+Summary: OPAL firmware (aka skiboot), used in booting OpenPOWER systems
+Group: System/Emulators/PC
+Version: %{qemuver}
+Release: 0
+BuildArch: noarch
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+Provides: %name:%_datadir/%name/forsplits/06
+
+%description skiboot
+Provides OPAL (OpenPower Abstraction Layer) firmware, aka skiboot, as
+traditionally packaged with QEMU.
+
%package ksm
Summary: Kernel Samepage Merging services
Group: System/Emulators/PC
@@ -1470,6 +1487,13 @@
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
+
+# in support of update-alternatives
+mv %{buildroot}%_datadir/%name/skiboot.lid
%{buildroot}%_datadir/%name/skiboot.lid.qemu
+# create a dummy target for /etc/alternatives/skiboot.lid
+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
do
@@ -1544,6 +1568,15 @@
%postun ksm
%service_del_postun ksm.service
+%post skiboot
+update-alternatives --install \
+ %{_datadir}/%name/skiboot.lid skiboot.lid
%{_datadir}/%name/skiboot.lid.qemu 15
+
+%postun skiboot
+if [ ! -f %{_datadir}/%name/skiboot.lid.qemu ] ; then
+ update-alternatives --remove skiboot.lid %{_datadir}/%name/skiboot.lid.qemu
+fi
+
%endif # qemu
# ========================================================================
@@ -1575,7 +1608,6 @@
%_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
@@ -1751,7 +1783,6 @@
%_datadir/%name/canyonlands.dtb
%_datadir/%name/openbios-ppc
%_datadir/%name/qemu_vga.ndrv
-%_datadir/%name/skiboot.lid
%_datadir/%name/slof.bin
%_datadir/%name/u-boot.e500
%_datadir/%name/u-boot-sam460-20100605.bin
@@ -2007,6 +2038,15 @@
%endif
%endif
+%files skiboot
+%defattr(-, root, root)
+%dir %_datadir/%name
+%dir %_datadir/%name/forsplits
+%_datadir/%name/forsplits/06
+%_datadir/%name/skiboot.lid
+%_datadir/%name/skiboot.lid.qemu
+%ghost %_sysconfdir/alternatives/skiboot.lid
+
%files vhost-user-gpu
%defattr(-, root, root)
%dir %_datadir/%name/vhost-user
