2caa2ff976
Porting CentOS patch 1001-add-tboot.patch Ignore 3 CentOS patches: a) 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch It replaces "CentOS" with "Linux" in grub menu, that is introduced by a patch from grub2-2.02-0.86.el7.centos.src.rpm. 0176-Make-grub2-mkconfig-construct-titles-that-look-like-.patch b) 1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch It is the supplement patch of 0263-Fix-grub_net_hwaddr_to_str.patch, which is from grub2-2.02-0.86.el7.centos.src.rpm. The original issue is introduced by 0248-Add-support-for-non-Ethernet-network-cards.patch, which is also from grub2-2.02-0.86.el7.centos.src.rpm. 3) 1003-tftp-roll-over-block-counter-to-prevent-timeouts-wit.patch It is duplicate of the patch in grub2_2.04-20.debian.tar.xz. debian/patches/tftp-roll-over-block-counter.patch Other patches in centos/meta_patches modify the spec file. The grub2 for each distributions is deep customized, so just ignore them. BTW, not using dl_path, because the package on salsa.debian.org has building issue. Test Plan: Pass: successfully build test Pass: successfully install test Pass: successfully boot test Story: 2009221 Task: 43679 Signed-off-by: Yue Tao <yue.tao@windriver.com> Change-Id: Icfd2f1993fd123824155c94da26c0ddf9a9c0873
33 lines
821 B
Diff
33 lines
821 B
Diff
From be38cbc51f89493c46e299950937b85893ca05e8 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] grub2: add tboot
|
|
|
|
Original patch is 1001-add-tboot.patch
|
|
|
|
Signed-off-by: Bin Qian <bin.qian@windriver.com>
|
|
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
|
|
---
|
|
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 0cd4cf5..81435a8 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -28,6 +28,11 @@ vt_handoff="@VT_HANDOFF@"
|
|
|
|
. "$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.25.1
|
|
|