From 51c12eb1c8134e46457ecbccbf7bebf69821dd72 Mon Sep 17 00:00:00 2001 From: jinlun Date: Tue, 7 May 2024 14:42:48 +0800 Subject: [PATCH] Fix the TPCM feature issue, and ignore signing failures due to insufficient permissions. --- ...re-add-tpcm-support-with-ipmi-channel.patch | 2 +- shim.spec | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Feature-add-tpcm-support-with-ipmi-channel.patch b/Feature-add-tpcm-support-with-ipmi-channel.patch index fb58bd4..ad92e5c 100644 --- a/Feature-add-tpcm-support-with-ipmi-channel.patch +++ b/Feature-add-tpcm-support-with-ipmi-channel.patch @@ -185,7 +185,7 @@ index 0000000..a086620 + CHAR16 *description) +{ + UINT32 filename_len = StrLen(description) * 2 + 1; -+ UINT32 stage_base = bm_stage_base++; ++ UINT32 stage_base = bm_stage_base; + UINT8 filename[FIRMWARE_NAME_SIZE] = {0}; + + if (filename_len > FIRMWARE_NAME_SIZE) { diff --git a/shim.spec b/shim.spec index be999e9..6dde1b6 100644 --- a/shim.spec +++ b/shim.spec @@ -25,7 +25,7 @@ Name: shim Version: 15.7 -Release: 9 +Release: 10 Summary: First-stage UEFI bootloader ExclusiveArch: x86_64 aarch64 License: BSD @@ -120,12 +120,12 @@ cd .. %if 0%{?openEuler_sign_rsa} echo "start sign" -sh /usr/lib/rpm/brp-ebs-sign --efi %{_builddir}/shim-%{version}/build-%{efi_arch}/shim%{efi_arch}.efi -sh /usr/lib/rpm/brp-ebs-sign --efi %{_builddir}/shim-%{version}/build-%{efi_arch}/fb%{efi_arch}.efi -sh /usr/lib/rpm/brp-ebs-sign --efi %{_builddir}/shim-%{version}/build-%{efi_arch}/mm%{efi_arch}.efi -mv %{_builddir}/shim-%{version}/build-%{efi_arch}/shim%{efi_arch}.efi.sig %{_builddir}/shim-%{version}/build-%{efi_arch}/shim%{efi_arch}.efi -mv %{_builddir}/shim-%{version}/build-%{efi_arch}/fb%{efi_arch}.efi.sig %{_builddir}/shim-%{version}/build-%{efi_arch}/fb%{efi_arch}.efi -mv %{_builddir}/shim-%{version}/build-%{efi_arch}/mm%{efi_arch}.efi.sig %{_builddir}/shim-%{version}/build-%{efi_arch}/mm%{efi_arch}.efi +sh /usr/lib/rpm/brp-ebs-sign --efi %{_builddir}/shim-%{version}/build-%{efi_arch}/shim%{efi_arch}.efi || [ $? -eq 2 ] && echo "failed to sign, skip signgture" +sh /usr/lib/rpm/brp-ebs-sign --efi %{_builddir}/shim-%{version}/build-%{efi_arch}/fb%{efi_arch}.efi || [ $? -eq 2 ] && echo "failed to sign, skip signgture" +sh /usr/lib/rpm/brp-ebs-sign --efi %{_builddir}/shim-%{version}/build-%{efi_arch}/mm%{efi_arch}.efi || [ $? -eq 2 ] & echo "failed to sign, skip signgture" +mv %{_builddir}/shim-%{version}/build-%{efi_arch}/shim%{efi_arch}.efi.sig %{_builddir}/shim-%{version}/build-%{efi_arch}/shim%{efi_arch}.efi ||: +mv %{_builddir}/shim-%{version}/build-%{efi_arch}/fb%{efi_arch}.efi.sig %{_builddir}/shim-%{version}/build-%{efi_arch}/fb%{efi_arch}.efi ||: +mv %{_builddir}/shim-%{version}/build-%{efi_arch}/mm%{efi_arch}.efi.sig %{_builddir}/shim-%{version}/build-%{efi_arch}/mm%{efi_arch}.efi ||: %endif %install @@ -185,6 +185,10 @@ make test /usr/src/debug/%{name}-%{version}-%{release}/* %changelog +* Tue May 7 2024 jinlun - 15.7-10 +- Fix the TPCM feature issue, and ignore signing failures + due to insufficient permissions. + * Mon Apr 1 2024 jinlun - 15.7-9 - Interface for replacing the EFI signature -- Gitee