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>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 5e0c8a6125403db7e90990d20c1cdda5cb9deb78 Mon Sep 17 00:00:00 2001
|
|
From: jmckenna <jason.mckenna@windriver.com>
|
|
Date: Wed, 28 Mar 2018 14:08:57 -0400
|
|
Subject: Patch GRUB so that it doesn't add a trailing colon after MAC
|
|
|
|
A CentOS GRUB patch added support for macs > 6B in size. This
|
|
breaks PXEbooting the installer, because a routine within grub
|
|
relies on the max MAC string length.
|
|
---
|
|
SOURCES/grub.macros | 2 +-
|
|
SOURCES/grub.patches | 2 ++
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index ffdd23c..8fcb272 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -81,7 +81,7 @@
|
|
%global legacy_package_arch pc
|
|
%global platform pc
|
|
|
|
-%global wrs_modules " multiboot multiboot2"
|
|
+%global wrs_modules " multiboot multiboot2 regexp"
|
|
%else
|
|
%global wrs_modules ""
|
|
|
|
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
|
|
index e24bd8c..73ccdee 100644
|
|
--- a/SOURCES/grub.patches
|
|
+++ b/SOURCES/grub.patches
|
|
@@ -260,3 +260,5 @@ 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
|
|
+Patch1002: 1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch
|
|
+
|
|
--
|
|
2.7.4
|
|
|