Hello community,
here is the log from the commit of package shim for openSUSE:Factory checked in
at 2020-04-04 12:19:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shim (Old)
and /work/SRC/openSUSE:Factory/.shim.new.3248 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim"
Sat Apr 4 12:19:37 2020 rev:80 rq:790063 version:15+git47
Changes:
--------
--- /work/SRC/openSUSE:Factory/shim/shim.changes 2020-03-25
23:42:52.927985471 +0100
+++ /work/SRC/openSUSE:Factory/.shim.new.3248/shim.changes 2020-04-04
12:19:41.475637883 +0200
@@ -1,0 +2,12 @@
+Tue Mar 31 08:38:56 UTC 2020 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Use the full path of efibootmgr to avoid errors when invoking
+ shim-install from packagekitd (bsc#1168104)
+
+-------------------------------------------------------------------
+Mon Mar 30 06:20:47 UTC 2020 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Use "suse_version" instead of "sle_version" to avoid
+ shim_lib64_share_compat being set in Tumbleweed forever.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shim.spec ++++++
--- /var/tmp/diff_new_pack.Xy5W3C/_old 2020-04-04 12:19:42.739638970 +0200
+++ /var/tmp/diff_new_pack.Xy5W3C/_new 2020-04-04 12:19:42.743638973 +0200
@@ -29,7 +29,7 @@
%else
%define sysefibasedir %{_datadir}/efi
%define sysefidir %{sysefibasedir}/%{_target_cpu}
-%if "%{grubplatform}" == "x86_64-efi" && 0%{?sle_version} < 160000
+%if "%{grubplatform}" == "x86_64-efi" && 0%{?suse_version} < 1600
# provide compatibility sym-link for residual kiwi, etc.
%define shim_lib64_share_compat 1
%endif
++++++ shim-install ++++++
--- /var/tmp/diff_new_pack.Xy5W3C/_old 2020-04-04 12:19:42.831639049 +0200
+++ /var/tmp/diff_new_pack.Xy5W3C/_new 2020-04-04 12:19:42.831639049 +0200
@@ -14,6 +14,7 @@
libdir="/usr/lib64" # Beware, this is arch dependent!
datadir="/usr/share"
source_dir="${datadir}/efi/${arch}"
+efibootmgr="/usr/sbin/efibootmgr"
grub_probe="/usr/sbin/grub2-probe"
grub_mkrelpath="/usr/bin/grub2-mkrelpath"
grub_install="/usr/sbin/grub2-install"
@@ -252,9 +253,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
@@ -335,9 +336,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")"
@@ -359,12 +360,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
