d3d8639028
When do Centos 7.5 upgraded, some patches didn't resolve and cause the fuzzy in the line numbers of the patches. And it may cause .orig file is created when do patch. And this .orig file will lead to rpm packaging failure due to the unexpected and unpackaged .orig file. Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Solution: Safest solution is to de-fuzz our patches. Story: 2003389 Task: 26755 Change-Id: I4bcf73175e81083a575d35d4b1448b29b11beaf7 Signed-off-by: slin14 <shuicheng.lin@intel.com>
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
From 25964e485c769efcccf853babcc8263eb1c89baf Mon Sep 17 00:00:00 2001
|
|
From: jmckenna <jason.mckenna@windriver.com>
|
|
Date: Wed, 28 Mar 2018 12:53:34 -0400
|
|
Subject: WRS: 0010-grub2-add-tboot.patch
|
|
|
|
---
|
|
SOURCES/grub.macros | 5 +++++
|
|
SOURCES/grub.patches | 1 +
|
|
2 files changed, 6 insertions(+)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 9ef91d6..ffdd23c 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -81,6 +81,10 @@
|
|
%global legacy_package_arch pc
|
|
%global platform pc
|
|
|
|
+%global wrs_modules " multiboot multiboot2"
|
|
+%else
|
|
+%global wrs_modules ""
|
|
+
|
|
%endif
|
|
|
|
%ifarch aarch64
|
|
@@ -327,6 +331,7 @@ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo \\\
|
|
search_label serial sleep syslinuxcfg test tftp \\\
|
|
video xfs" \
|
|
GRUB_MODULES+=%{efi_modules} \
|
|
+GRUB_MODULES+=%{wrs_modules} \
|
|
%{expand:%%{mkimage %{1} %{2} %{3} %{4} %{5} %{6} %{7}}} \
|
|
%{nil}
|
|
|
|
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
|
|
index d7475f0..e24bd8c 100644
|
|
--- a/SOURCES/grub.patches
|
|
+++ b/SOURCES/grub.patches
|
|
@@ -259,3 +259,4 @@ Patch0258: 0258-Fix-one-more-coverity-complaint.patch
|
|
Patch0260: 0260-Fix-up-linux-params-usage.patch
|
|
Patch0261: 0261-Fix-grub_net_hwaddr_to_str.patch
|
|
Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
|
|
+Patch1001: 1001-add-tboot.patch
|
|
--
|
|
2.7.4
|
|
|