Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package shim-leap for openSUSE:Factory checked in at 2021-07-22 22:43:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shim-leap (Old) and /work/SRC/openSUSE:Factory/.shim-leap.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim-leap" Thu Jul 22 22:43:27 2021 rev:18 rq:907622 version:15.4 Changes: -------- --- /work/SRC/openSUSE:Factory/shim-leap/shim-leap.changes 2021-05-20 19:25:35.273812675 +0200 +++ /work/SRC/openSUSE:Factory/.shim-leap.new.1899/shim-leap.changes 2021-07-22 22:44:11.271135100 +0200 @@ -1,0 +2,12 @@ +Wed Jul 21 09:38:30 UTC 2021 - j...@suse.com + +- Update to shim to 15.4-lp152.4.17.1 from openSUSE Leap 15.2 + + Version: 15.4, "Thu Jul 15 2021" + + Updated openSUSE x86 signature + + Include the fixes for bsc#1187696, bsc#1185261, bsc#1185441, + bsc#1187071, bsc#1185621, bsc#1185261, bsc#1185232, bsc#1185261, + bsc#1187260, bsc#1185232. +- Remove shim-install because the shim-install is updated in Leap + 15.2 RPM. + +------------------------------------------------------------------- Old: ---- shim-15.4-lp152.4.8.1.x86_64.rpm shim-install New: ---- shim-15.4-lp152.4.17.1.x86_64.rpm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shim-leap.spec ++++++ --- /var/tmp/diff_new_pack.kgnFTs/_old 2021-07-22 22:44:11.747134480 +0200 +++ /var/tmp/diff_new_pack.kgnFTs/_new 2021-07-22 22:44:11.751134475 +0200 @@ -1,7 +1,7 @@ # # spec file for package shim-leap # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -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 https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -30,9 +30,8 @@ Summary: UEFI shim loader License: BSD-2-Clause Group: System/Boot -Source: shim-15.4-lp152.4.8.1.x86_64.rpm +Source: shim-15.4-lp152.4.17.1.x86_64.rpm Source1: README -Source2: shim-install BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 @@ -58,10 +57,6 @@ cp -a * %{buildroot} cp %{S:1} . -# install updated shim-install -chmod +x %{S:2} -cp %{S:2} %{buildroot}/%{_sbindir}/shim-install - %post -n shim /sbin/update-bootloader --reinit || true ++++++ shim-15.4-lp152.4.8.1.x86_64.rpm -> shim-15.4-lp152.4.17.1.x86_64.rpm ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/sbin/shim-install new/usr/sbin/shim-install --- old/usr/sbin/shim-install 2021-04-22 14:21:29.000000000 +0200 +++ new/usr/sbin/shim-install 2021-07-15 12:12:57.000000000 +0200 @@ -77,6 +77,42 @@ *) ca_string="";; esac +is_azure () { + local bios_vendor; + local product_name; + local sys_vendor; + + local sysfs_dmi_id="/sys/class/dmi/id" + + if test -e "${sysfs_dmi_id}/bios_vendor"; then + bios_vendor=$(cat "${sysfs_dmi_id}/bios_vendor") + fi + if test -e "${sysfs_dmi_id}/product_name"; then + product_name=$(cat "${sysfs_dmi_id}/product_name") + fi + if test -e "${sysfs_dmi_id}/sys_vendor"; then + sys_vendor=$(cat "${sysfs_dmi_id}/sys_vendor") + fi + + if test "x${bios_vendor}" != "xMicrosoft Corporation"; then + # return false + return 1 + fi + + if test "x${product_name}" != "xVirtual Machine"; then + # return false + return 1 + fi + + if test "x${sys_vendor}" != "xMicrosoft Corporation"; then + # return false + return 1 + fi + + # return true + return 0 +} + usage () { echo "Usage: $self [OPTION] [INSTALL_DEVICE]" echo @@ -396,3 +432,22 @@ fi fi +# bsc#1185464 bsc#1185961 +# The Azure firmware sometimes doesn't respect the boot option created by +# either efibootmgr or fallback.efi so we have to remove fallback.efi to +# avoid the endless reset loop. +if is_azure; then + # Skip the workaround if we don't own \EFI\Boot or the removable + # option is used + if test "$update_boot" = "yes" && test "$removable" = "no"; then + # Remove fallback.efi which could cause the reset loop in Azure + rm -f "${efibootdir}/fallback.efi" + # Remove the older grub binary and config + rm -f "${efibootdir}/grub.efi" + rm -f "${efibootdir}/grub.cfg" + # Install new grub binary and config file to \EFI\Boot as + # the "removable" option + cp "${efidir}/grub.cfg" "${efibootdir}/grub.cfg" + cp "${efidir}/grub.efi" "${efibootdir}/grub.efi" + fi +fi Binary files old/usr/share/efi/x86_64/MokManager.efi and new/usr/share/efi/x86_64/MokManager.efi differ Binary files old/usr/share/efi/x86_64/fallback.efi and new/usr/share/efi/x86_64/fallback.efi differ Binary files old/usr/share/efi/x86_64/shim-opensuse.efi and new/usr/share/efi/x86_64/shim-opensuse.efi differ
