Hello community,
here is the log from the commit of package shim for openSUSE:Factory checked in at 2018-12-11 15:42:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shim (Old)
and /work/SRC/openSUSE:Factory/.shim.new.19453 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim"
Tue Dec 11 15:42:04 2018 rev:70 rq:655466 version:14
Changes:
--------
--- /work/SRC/openSUSE:Factory/shim/shim.changes 2018-09-18 11:42:16.227983696 +0200
+++ /work/SRC/openSUSE:Factory/.shim.new.19453/shim.changes 2018-12-11 15:42:05.746584508 +0100
@@ -1,0 +2,7 @@
+Wed Dec 5 10:28:00 UTC 2018 - Gary Ching-Pang Lin
+
+- Update shim-install to specify the target for grub2-install and
+ change the boot efi file name according to the architecture
+ (bsc#1118363, FATE#325971)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shim.spec ++++++
--- /var/tmp/diff_new_pack.3620Cu/_old 2018-12-11 15:42:06.486583698 +0100
+++ /var/tmp/diff_new_pack.3620Cu/_new 2018-12-11 15:42:06.486583698 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# needssslcertforbuild
++++++ shim-install ++++++
--- /var/tmp/diff_new_pack.3620Cu/_old 2018-12-11 15:42:06.582583593 +0100
+++ /var/tmp/diff_new_pack.3620Cu/_new 2018-12-11 15:42:06.590583584 +0100
@@ -15,10 +15,24 @@
grub_probe="/usr/sbin/grub2-probe"
grub_mkrelpath="/usr/bin/grub2-mkrelpath"
grub_install="/usr/sbin/grub2-install"
+grub_install_target=
self="`basename $0`"
grub_cfg="/boot/grub2/grub.cfg"
update_boot=no
def_grub_efi="${source_dir}/grub.efi"
+def_boot_efi=
+
+arch=`uname -m`
+if [ x${arch} = xx86_64 ] ; then
+ grub_install_target="x86_64-efi"
+ def_boot_efi="bootx64.efi"
+elif [ x${arch} = xaarch64 ] ; then
+ grub_install_target="arm64-efi"
+ def_boot_efi="bootaa64.efi"
+else
+ echo "Unsupported architecture: ${arch}"
+ exit 1
+fi
# Get GRUB_DISTRIBUTOR.
if test -f "${sysconfdir}/default/grub" ; then
@@ -124,7 +138,7 @@
no_nvram=yes ;;
--suse-enable-tpm)
- source_grub_efi="/usr/lib/grub2/x86_64-efi/grub-tpm.efi" ;;
+ source_grub_efi="/usr/lib/grub2/${grub_install_target}/grub-tpm.efi" ;;
--clean)
clean=yes ;;
@@ -211,8 +225,8 @@
exit 1;
fi
-if test "$removable" = "no" -a -f "$efibootdir/bootx64.efi"; then
- if test -n "$ca_string" && (grep -q "$ca_string" "$efibootdir/bootx64.efi"); then
+if test "$removable" = "no" -a -f "$efibootdir/$def_boot_efi"; then
+ if test -n "$ca_string" && (grep -q "$ca_string" "$efibootdir/$def_boot_efi"); then
update_boot=yes
fi
else
@@ -226,7 +240,7 @@
rm -f "${efidir}/grub.cfg"
rm -f "${efidir}/boot.csv"
if test "$update_boot" = "yes"; then
- rm -f "${efibootdir}/bootx64.efi"
+ rm -f "${efibootdir}/${def_boot_efi}"
rm -f "${efibootdir}/fallback.efi"
fi
if test "$no_nvram" = no && test -n "$bootloader_id"; then
@@ -261,7 +275,7 @@
fi
if test "$update_boot" = "yes"; then
- cp "${source_dir}/shim.efi" "${efibootdir}/bootx64.efi"
+ cp "${source_dir}/shim.efi" "${efibootdir}/${def_boot_efi}"
if test "$removable" = "no"; then
cp "${source_dir}/fallback.efi" "${efibootdir}"
fi
@@ -300,7 +314,9 @@
make_grubcfg > "${efidir}/grub.cfg"
# bnc#889765 GRUB shows broken letters at boot
# invoke grub_install to initialize /boot/grub2 directory with files needed by grub.cfg
-${grub_install} --no-nvram
+# bsc#1118363 shim-install didn't specify the target for grub2-install
+# set the target explicitly for some special cases
+${grub_install} --target=${grub_install_target} --no-nvram
if test "$no_nvram" = no && test -n "$bootloader_id"; then