remove BuildRequires:pesign >= 0.99-8 and fix bug about petitboot doesn't ignore EFI entries for ppc64le

This commit is contained in:
peng_zou 2024-07-15 14:57:35 +08:00
parent 2bdddd766a
commit 234d66e79a
3 changed files with 43 additions and 1 deletions

View File

@ -235,3 +235,4 @@ Patch234: Fix-that-patch-28dcf48482-introduced-old-code.patch
Patch235: backport-CVE-2021-46848-lib-libtasn1-Fix-ETYPE_OK-off-by-one-array.patch Patch235: backport-CVE-2021-46848-lib-libtasn1-Fix-ETYPE_OK-off-by-one-array.patch
Patch236: backport-disk-mdraid1x_linux-Prevent-infinite-recursion.patch Patch236: backport-disk-mdraid1x_linux-Prevent-infinite-recursion.patch
Patch237: backport-Export-all-variables-from-the-initial-context-when-c.patch Patch237: backport-Export-all-variables-from-the-initial-context-when-c.patch
Patch238: grub2-ppc64le-fix-bug-about-petitboot-doesn-t-ignore-EFI-entries.patch

View File

@ -0,0 +1,33 @@
From 801733fd3971ee681146f9eb6381cbaf78c3d4c4 Mon Sep 17 00:00:00 2001
From: peng_zou <peng.zou@shingroup.cn>
Date: Mon, 15 Jul 2024 14:45:16 +0800
Subject: [PATCH] fix bug about petitboot doesn't ignore EFI entries for
ppc64le
---
util/grub.d/95_textmode.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/util/grub.d/95_textmode.in b/util/grub.d/95_textmode.in
index d6c1dbf..9171f95 100644
--- a/util/grub.d/95_textmode.in
+++ b/util/grub.d/95_textmode.in
@@ -1,12 +1,13 @@
#!/bin/sh
cat <<EOF
-if [ "\${grub_platform}" = "efi" ]; then
+if [ -d /sys/firmware/efi ]; then
+ echo "
# On EFI systems we can only have graphics *or* serial, so allow the user
# to switch between the two
hiddenentry 'Text mode' --hotkey 't' {
set textmode=true
terminal_output console
- }
+ }"
fi
EOF
--
2.43.0

View File

@ -14,7 +14,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.12 Version: 2.12
Release: 21 Release: 22
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -43,8 +43,10 @@ BuildRequires: texinfo gettext-devel dejavu-sans-fonts help2man systemd fuse-de
BuildRequires: libtasn1-devel BuildRequires: libtasn1-devel
%ifarch %{golang_arches} %ifarch %{golang_arches}
%ifnarch ppc64le
BuildRequires: pesign >= 0.99-8 BuildRequires: pesign >= 0.99-8
%endif %endif
%endif
%if %{?_with_ccache: 1}%{?!_with_ccache: 0} %if %{?_with_ccache: 1}%{?!_with_ccache: 0}
BuildRequires: ccache BuildRequires: ccache
%endif %endif
@ -454,6 +456,12 @@ fi
%{_datadir}/man/man* %{_datadir}/man/man*
%changelog %changelog
* Mon Jul 15 2024 peng.zou <peng.zou@shingroup.cn> - 1:2.12-22
- Type:bugfix
- CVE:NA
- SUG:NA
- DESC:remove BuildRequires:pesign >= 0.99-8 and fix bug about petitboot doesn't ignore EFI entries for ppc64le
* Fri Jun 28 2024 yueyuankun <yueyuankun@kylinos.cn> - 1:2.12-21 * Fri Jun 28 2024 yueyuankun <yueyuankun@kylinos.cn> - 1:2.12-21
- Type:bugfix - Type:bugfix
- CVE:NA - CVE:NA