Hello community, here is the log from the commit of package shim-leap for openSUSE:Leap:15.2 checked in at 2020-04-08 12:49:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/shim-leap (Old) and /work/SRC/openSUSE:Leap:15.2/.shim-leap.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim-leap" Wed Apr 8 12:49:14 2020 rev:3 rq:791654 version:14 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/shim-leap/shim-leap.changes 2020-01-15 16:02:10.855886045 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.shim-leap.new.3248/shim-leap.changes 2020-04-08 12:49:41.686383249 +0200 @@ -1,0 +2,18 @@ +Tue Mar 31 08:38:56 UTC 2020 - Gary Ching-Pang Lin <[email protected]> + +- Use the full path of efibootmgr to avoid errors when invoking + shim-install from packagekitd (bsc#1168104) + +------------------------------------------------------------------- +Mon Mar 30 06:05:58 UTC 2020 - Gary Ching-Pang Lin <[email protected]> + +- Use "suse_version" instead of "sle_version" to avoid + shim_lib64_share_compat being set in Tumbleweed forever. + +------------------------------------------------------------------- +Fri Mar 27 05:32:11 UTC 2020 - Gary Ching-Pang Lin <[email protected]> + +- Move 'efi'-executables to '/usr/share/efi' + (FATE#326960, bsc#1166523) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shim-leap.spec ++++++ --- /var/tmp/diff_new_pack.gjnDzS/_old 2020-04-08 12:49:42.138383485 +0200 +++ /var/tmp/diff_new_pack.gjnDzS/_new 2020-04-08 12:49:42.142383486 +0200 @@ -1,7 +1,7 @@ # # spec file for package shim-leap # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,14 @@ # +# Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523) +%define sysefibasedir %{_datadir}/efi +%define sysefidir %{sysefibasedir}/%{_target_cpu} +%if 0%{?suse_version} < 1600 +# provide compatibility sym-link for residual kiwi, etc. +%define shim_lib64_share_compat 1 +%endif + Name: shim-leap Version: 14 Release: 0 @@ -49,13 +57,31 @@ cp -a * %{buildroot} install -m 755 %{SOURCE1} %{buildroot}/%{_sbindir} +# Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523) +install -d %{buildroot}/%{sysefidir} +mv %{buildroot}/usr/lib64/efi/* %{buildroot}/%{sysefidir} +%if %{defined shim_lib64_share_compat} +ln -srf %{buildroot}/%{sysefidir}/*.efi %{buildroot}/usr/lib64/efi/ +%endif + %post -n shim /sbin/update-bootloader --reinit || true %files -n shim +%dir %{?sysefibasedir} +%dir %{sysefidir} +%{sysefidir}/shim.efi +%{sysefidir}/shim-*.efi +%{sysefidir}/shim-*.der +%{sysefidir}/MokManager.efi +%{sysefidir}/fallback.efi +%if %{defined shim_lib64_share_compat} +# provide compatibility sym-link for previous kiwi, etc. +%dir /usr/lib64/efi +/usr/lib64/efi/*.efi +%endif /etc/uefi /usr/sbin/shim-install -/usr/lib64/efi /usr/share/doc/packages/shim %changelog ++++++ shim-install ++++++ --- /var/tmp/diff_new_pack.gjnDzS/_old 2020-04-08 12:49:42.170383501 +0200 +++ /var/tmp/diff_new_pack.gjnDzS/_new 2020-04-08 12:49:42.170383501 +0200 @@ -12,6 +12,7 @@ sysconfdir="/etc" libdir="/usr/lib64" source_dir="$libdir/efi" +efibootmgr="/usr/sbin/efibootmgr" grub_probe="/usr/sbin/grub2-probe" grub_mkrelpath="/usr/bin/grub2-mkrelpath" grub_install="/usr/sbin/grub2-install" @@ -245,9 +246,9 @@ fi if test "$no_nvram" = no && test -n "$bootloader_id"; then # Delete old entries from the same distributor. - for bootnum in `efibootmgr | grep '^Boot[0-9]' | \ + for bootnum in `$efibootmgr | grep '^Boot[0-9]' | \ fgrep -i " $bootloader_id" | cut -b5-8`; do - efibootmgr -b "$bootnum" -B + $efibootmgr -b "$bootnum" -B done fi exit 0 @@ -323,9 +324,9 @@ modprobe -q efivars 2>/dev/null || true # Delete old entries from the same distributor. - for bootnum in `efibootmgr | grep '^Boot[0-9]' | \ + for bootnum in `$efibootmgr | grep '^Boot[0-9]' | \ fgrep -i " $bootloader_id" | cut -b5-8`; do - efibootmgr -b "$bootnum" -B + $efibootmgr -b "$bootnum" -B done efidir_drive="$("$grub_probe" --target=drive --device-map= "$efidir")" @@ -344,12 +345,12 @@ efidir_disk="$("$grub_probe" --target=disk --device-map= -d "$mddev")" efidir_part="$(echo "$efidir_drive" | sed 's/^([^,]*,[^0-9]*//; s/[^0-9].*//')" efidir_d=${mddev#/dev/} - efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \ + $efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \ -L "$bootloader_id ($efidir_d)" -l "\\EFI\\$efi_distributor\\$efi_file" done else efidir_part="$(echo "$efidir_drive" | sed 's/^([^,]*,[^0-9]*//; s/[^0-9].*//')" - efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \ + $efibootmgr -c -d "$efidir_disk" -p "$efidir_part" -w \ -L "$bootloader_id" -l "\\EFI\\$efi_distributor\\$efi_file" fi fi
