Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package shim for openSUSE:Factory checked in
at 2023-10-10 20:52:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shim (Old)
and /work/SRC/openSUSE:Factory/.shim.new.28202 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim"
Tue Oct 10 20:52:13 2023 rev:114 rq:1116629 version:15.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/shim/shim.changes 2023-05-26
20:15:15.336184744 +0200
+++ /work/SRC/openSUSE:Factory/.shim.new.28202/shim.changes 2023-10-10
20:52:30.165123807 +0200
@@ -1,0 +2,18 @@
+Thu Oct 5 13:19:48 UTC 2023 - Ludwig Nussel <lnus...@suse.com>
+
+- Don't require grub so shim can still be used with systemd-boot
+
+-------------------------------------------------------------------
+Wed Sep 20 04:33:59 UTC 2023 - Michael Chang <mch...@suse.com>
+
+- Update shim-install to fix boot failure of ext4 root file system
+ on RAID10 (bsc#1205855)
+ 226c94ca5cfca Use hint in looking for root if possible
+
+-------------------------------------------------------------------
+Tue Sep 19 08:36:17 UTC 2023 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Adopt the macros from fde-tpm-helper-macros to update the
+ signature in the sealed key after a bootloader upgrade
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shim.spec ++++++
--- /var/tmp/diff_new_pack.2B6odh/_old 2023-10-10 20:52:33.481243978 +0200
+++ /var/tmp/diff_new_pack.2B6odh/_new 2023-10-10 20:52:33.485244123 +0200
@@ -83,6 +83,7 @@
BuildRequires: pesign
BuildRequires: pesign-obs-integration
%if 0%{?suse_version} > 1320
+BuildRequires: fde-tpm-helper-rpm-macros
BuildRequires: update-bootloader-rpm-macros
%endif
%if 0%{?update_bootloader_requires:1}
@@ -90,9 +91,13 @@
%else
Requires: perl-Bootloader
%endif
+%if 0%{?fde_tpm_update_requires:1}
+%fde_tpm_update_requires
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# For shim-install script
-Requires: grub2-%{grubplatform}
+# For shim-install script grub is needed but we also want to use
+# shim for systemd-boot where shim-install is not actually used.
+# Requires: grub2-%{grubplatform}
Requires: mokutil
ExclusiveArch: x86_64 aarch64
@@ -286,6 +291,10 @@
%{?buildroot:%__rm -rf "%{buildroot}"}
%post
+%if 0%{?fde_tpm_update_post:1}
+%fde_tpm_update_post shim
+%endif
+
%if 0%{?update_bootloader_check_type_reinit_post:1}
%update_bootloader_check_type_reinit_post grub2-efi
%else
@@ -316,6 +325,7 @@
%if %{defined update_bootloader_posttrans}
%posttrans
%{?update_bootloader_posttrans}
+%{?fde_tpm_update_posttrans}
%endif
%files
++++++ shim-install ++++++
--- /var/tmp/diff_new_pack.2B6odh/_old 2023-10-10 20:52:33.593248037 +0200
+++ /var/tmp/diff_new_pack.2B6odh/_new 2023-10-10 20:52:33.597248182 +0200
@@ -419,8 +419,19 @@
done
fi
+hints="`"${grub_probe}" --target=hints_string "${grub_cfg_dirname}" 2>
/dev/null`"
+
+if [ "x$hints" != x ]; then
+ echo "if [ x\$feature_platform_search_hint = xy ]; then"
+ echo " search --no-floppy --fs-uuid --set=root ${hints} ${cfg_fs_uuid}"
+ echo "else"
+ echo " search --no-floppy --fs-uuid --set=root ${cfg_fs_uuid}"
+ echo "fi"
+else
+ echo "search --no-floppy --fs-uuid --set=root ${cfg_fs_uuid}"
+fi
+
cat <<EOF
-search --fs-uuid --set=root ${cfg_fs_uuid}
set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
source "\${prefix}/${grub_cfg_basename}"
EOF
