integ/grub/grub2/centos/meta_patches/0006-grub2-ship-lst-files.patch
slin14 d3d8639028 de-fuzz grub2 patches
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>
2018-09-28 08:10:39 +08:00

26 lines
636 B
Diff

From 8fb898476d6a86b2b280bd63f1557dfe4d1360a4 Mon Sep 17 00:00:00 2001
From: root <root@yow-cgts4-lx.wrs.com>
Date: Tue, 23 Jan 2018 09:24:16 -0500
Subject: [PATCH] ship .lst files
---
SPECS/grub2.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 613f2e1..7e11008 100644
--- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec
@@ -265,6 +265,8 @@ fi
%files common -f grub.lang
%dir %{_libdir}/grub/
+%dir %{_libdir}/grub/%{grubefiarch}/
+%{_libdir}/grub/%{grubefiarch}/*.lst
%dir %{_datarootdir}/grub/
%dir %{_datarootdir}/grub/themes/
%exclude %{_datarootdir}/grub/themes/*
--
2.7.4