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>
26 lines
749 B
Diff
26 lines
749 B
Diff
From 31310ca5b5d10aff6bd4480bc78ef75504711ab1 Mon Sep 17 00:00:00 2001
|
|
From: root <root@yow-cgts1-lx.wrs.com>
|
|
Date: Fri, 6 Apr 2018 11:36:01 -0400
|
|
Subject: Don't strip files from non-EFI build of grub
|
|
|
|
---
|
|
SOURCES/grub.macros | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 8fcb272..cd2da06 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -471,8 +471,6 @@ cd .. \
|
|
%defattr(-,root,root) \
|
|
%dir %{_libdir}/grub/%{2}/ \
|
|
%{_libdir}/grub/%{2}/* \
|
|
-%exclude %{_libdir}/grub/%{2}/*.module \
|
|
-%exclude %{_libdir}/grub/%{2}/{boot,boot_hybrid,cdboot,diskboot,lzma_decompress,pxeboot}.{image,img} \
|
|
%exclude %{_libdir}/grub/%{2}/*.o \
|
|
%{nil}
|
|
|
|
--
|
|
2.7.4
|
|
|