From c9cf3a76023a60fa416036bb95da3e32cb977d4f Mon Sep 17 00:00:00 2001 From: jinlun Date: Fri, 22 Mar 2024 17:14:54 +0800 Subject: [PATCH] Interface for replacing the EFI signature --- grub2.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/grub2.spec b/grub2.spec index 10c3619..6f087ef 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.12 -Release: 5 +Release: 6 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -42,10 +42,6 @@ BuildRequires: autoconf automake device-mapper-devel freetype-devel git BuildRequires: texinfo gettext-devel dejavu-sans-fonts help2man systemd fuse-devel BuildRequires: libtasn1-devel -%if 0%{?openEuler_sign_rsa} -BuildRequires: sign-openEuler -%endif - %ifarch %{golang_arches} BuildRequires: pesign >= 0.99-8 %endif @@ -203,8 +199,10 @@ makeinfo --info --no-split -I docs -o docs/grub.info docs/grub.texi makeinfo --html --no-split -I docs -o docs/grub-dev.html docs/grub-dev.texi makeinfo --html --no-split -I docs -o docs/grub.html docs/grub.texi %if 0%{?openEuler_sign_rsa} -/opt/sign-openEuler/client --config /opt/sign-openEuler/config.toml add --key-name default-x509ee --file-type efi-image --key-type x509ee --sign-type authenticode %{_builddir}/grub-%{version}/grub-%{grubefiarch}-%{tarversion}/%{grubefiname} -/opt/sign-openEuler/client --config /opt/sign-openEuler/config.toml add --key-name default-x509ee --file-type efi-image --key-type x509ee --sign-type authenticode %{_builddir}/grub-%{version}/grub-%{grubefiarch}-%{tarversion}/%{grubeficdname} +sh /usr/lib/rpm/brp-ebs-sign --efi %{_builddir}/grub-%{version}/grub-%{grubefiarch}-%{tarversion}/%{grubefiname} +sh /usr/lib/rpm/brp-ebs-sign --efi %{_builddir}/grub-%{version}/grub-%{grubefiarch}-%{tarversion}/%{grubeficdname} +mv %{_builddir}/grub-%{version}/grub-%{grubefiarch}-%{tarversion}/%{grubefiname}.sig %{_builddir}/grub-%{version}/grub-%{grubefiarch}-%{tarversion}/%{grubefiname} +mv %{_builddir}/grub-%{version}/grub-%{grubefiarch}-%{tarversion}/%{grubeficdname}.sig %{_builddir}/grub-%{version}/grub-%{grubefiarch}-%{tarversion}/%{grubeficdname} %endif %check @@ -449,6 +447,12 @@ fi %{_datadir}/man/man* %changelog +* Fri Mar 22 2024 jinlun - 1:2.12-6 +- Type:requirement +- CVE:NA +- SUG:NA +- DESC:Interface for replacing the EFI signature + * Thu Mar 21 2024 zhangqiumiao - 1:2.12-5 - Type:requirement - CVE:NA -- Gitee