Hello community, here is the log from the commit of package skiboot for openSUSE:Factory checked in at 2020-10-08 13:13:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skiboot (Old) and /work/SRC/openSUSE:Factory/.skiboot.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skiboot" Thu Oct 8 13:13:45 2020 rev:19 rq:840107 version:6.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/skiboot/skiboot.changes 2020-07-03 00:08:59.863388190 +0200 +++ /work/SRC/openSUSE:Factory/.skiboot.new.4249/skiboot.changes 2020-10-08 13:14:03.307274066 +0200 @@ -1,0 +2,14 @@ +Wed Oct 7 16:21:24 UTC 2020 - Michal Suchanek <[email protected]> + +- Change the %build_firmware to build on 15 SP3 + +------------------------------------------------------------------- +Tue Oct 6 23:12:28 UTC 2020 - Bruce Rogers <[email protected]> + +- Use update-alternatives mechanism to coordinate with qemu-skiboot + (provided with qemu package set) on the provider of the + /usr/share/qemu/skiboot.lid firmware file. opal-firmware subpackage + uses a priority of 10, while qemu-skiboot uses a priority of 15 + (jsc#SLE-13240) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skiboot.spec ++++++ --- /var/tmp/diff_new_pack.IgiwuF/_old 2020-10-08 13:14:04.083274768 +0200 +++ /var/tmp/diff_new_pack.IgiwuF/_new 2020-10-08 13:14:04.087274772 +0200 @@ -16,7 +16,7 @@ # -%define build_firmware 0%{?is_opensuse} && !0%{?is_backports} +%define build_firmware ( 0%{?is_opensuse} && !0%{?is_backports} ) || !0%{?sle_version} || ( 0%{?sle_version} > 150200 ) Name: skiboot Version: 6.6.1 @@ -58,14 +58,18 @@ of an OpenPower system. 'pflash' is a tool to access the flash modules on such systems and update the OpenPower firmware. +%if %build_firmware %package -n opal-firmware Summary: OPAL firmware Group: System/Management BuildArch: noarch +Requires(post): update-alternatives +Requires(postun): update-alternatives %description -n opal-firmware OPAL firmware, aka skiboot, loads the bootloader and provides runtime services to the OS (Linux) on IBM Power and OpenPower systems. +%endif %prep %setup -q @@ -90,7 +94,10 @@ %if %build_firmware mkdir -p %{buildroot}%{_datadir}/qemu -install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid +install -m 644 -p skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid.opal +# create a dummy target for /etc/alternatives/skiboot.lid +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +ln -s -f %{_sysconfdir}/alternatives/skiboot.lid %{buildroot}%{_datadir}/qemu/skiboot.lid %endif %pre -n opal-prd @@ -105,6 +112,17 @@ %postun -n opal-prd %service_del_postun opal-prd.service +%if %build_firmware +%post -n opal-firmware +update-alternatives --install \ + %{_datadir}/qemu/skiboot.lid skiboot.lid %{_datadir}/qemu/skiboot.lid.opal 10 + +%postun -n opal-firmware +if [ ! -f %{_datadir}/qemu/skiboot.lid.opal ] ; then + update-alternatives --remove skiboot.lid %{_datadir}/qemu/skiboot.lid.opal +fi +%endif + %files -n opal-prd %defattr(-,root,root) %doc README.md LICENCE @@ -129,7 +147,10 @@ %if %build_firmware %files -n opal-firmware %doc README.md LICENCE -%{_datadir}/qemu/ +%dir %{_datadir}/qemu +%{_datadir}/qemu/skiboot.lid +%{_datadir}/qemu/skiboot.lid.opal +%ghost %_sysconfdir/alternatives/skiboot.lid %endif %changelog
