Accepting request 1112154 from home:gary_lin:branches:Base:System

- Add the new BuildRequires for EFI builds for the better FDE
  support: fde-tpm-helper-rpm-macros
  + Also add the the macros to %post and %posttrans

OBS-URL: https://build.opensuse.org/request/show/1112154
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=461

grub2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 19 06:31:43 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Add the new BuildRequires for EFI builds for the better FDE
+  support: fde-tpm-helper-rpm-macros
+  + Also add the the macros to %post and %posttrans
+
 -------------------------------------------------------------------
 Mon Sep 11 13:17:20 UTC 2023 - Chester Lin <clin@suse.com>
 

grub2.spec

@@ -157,6 +157,7 @@ BuildRequires:  update-bootloader-rpm-macros
 %endif
 
 %ifarch %{efi}
+BuildRequires:  fde-tpm-helper-rpm-macros
 BuildRequires:  grub2-branding
 BuildRequires:  squashfs
 %endif
@@ -444,6 +445,9 @@ Requires(post): %{name} = %{version}
 Requires:       perl-Bootloader
 Requires(post): perl-Bootloader
 %endif
+%if 0%{?fde_tpm_update_requires:1}
+%fde_tpm_update_requires
+%endif
 
 %description %{grubarch}
 The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@@ -1148,6 +1152,10 @@ fi
 %ifarch %{efi}
 
 %post %{grubefiarch}
+%if 0%{?fde_tpm_update_post:1}
+%fde_tpm_update_post grub2-efi
+%endif
+
 %if 0%{?update_bootloader_check_type_reinit_post:1}
 %update_bootloader_check_type_reinit_post grub2-efi
 %else
@@ -1183,6 +1191,7 @@ exit 0
 
 %posttrans %{grubefiarch}
 %{?update_bootloader_posttrans}
+%{?fde_tpm_update_posttrans}
 
 %endif