c9981d6ccc
(1)Release Version Upgrade (2)Matching code changes with el7 to el8_0.1 (3)Delete useless patches (4)Add patch "0013-grub2-fix-build-grub2-pc-modules-pkgs.patch" (5)Add patch "0014-grub2-Create-empty-grub2-pkgs.patch" 1.Delete 0002-grub2-fix-cflags.patch: As it has already deleted useless cflags info in el8 source code 2.Delete 0003-grub2-remove-debug-pkgs.patch: this patch is about debug info and build env. as gcc8.2 support debug info is dawnfs0, it doesn't match gdb debug, gdb support dawnfs(2,3,4 or 5), we may need not run the debug info, otherwise, if remain the patch, it prompt error as below when rpmbuild "Dwarf Error: wrong version in compilation unit header (is 0, should be 2, 3, 4 or 5)" 3.Delete 0004-grub2-remove-32b-requirements.patch: As it has already deleted the useless buildrequires in upgrade SRPM. 4.Add 0013-grub2-fix-build-grub2-pc-modules-pkgs.patch, fix to build grub2-pc-modules-2.02-66.el8.noarch.rpm, which is depended by other package, without the fix patch, it will missed building and prompt error for no such pkgs when install grub2-efi pkgs procedure. so we should create it act as el7 version work. Depends-On: https://review.opendev.org/#/c/726511/ Change-Id: I18d35834a981036fa0ab753c9b098d82e50f1366 Story: 2006729 Task: 37681 Signed-off-by: Long Li <lilong-neu@neusoft.com>
29 lines
683 B
Diff
29 lines
683 B
Diff
From 4a1a40ca64be1a2350ec90ceb9089dc0a3950231 Mon Sep 17 00:00:00 2001
|
|
From: Bin Qian <bin.qian@windriver.com>
|
|
Date: Tue, 21 Nov 2017 15:36:42 -0500
|
|
Subject: [PATCH 1/1] add tboot
|
|
|
|
---
|
|
util/grub.d/10_linux.in | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index 5482ebf..6e6b414 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -23,6 +23,11 @@ datarootdir="@datarootdir@"
|
|
|
|
. "$pkgdatadir/grub-mkconfig_lib"
|
|
|
|
+tboot=`cat /proc/cmdline | xargs -n1 | grep '^tboot=true$'` || true
|
|
+if [ -n "$tboot" ]; then
|
|
+ exit 0
|
|
+fi
|
|
+
|
|
export TEXTDOMAIN=@PACKAGE@
|
|
export TEXTDOMAINDIR="@localedir@"
|
|
|
|
--
|
|
2.7.4
|
|
|