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>
48 lines
2.2 KiB
Diff
48 lines
2.2 KiB
Diff
From ca7e4edddd48b0ffd0520a2ccb271bbe036aa1e5 Mon Sep 17 00:00:00 2001
|
|
From: root <root@yow-cgts4-lx.wrs.com>
|
|
Date: Tue, 23 Jan 2018 14:57:29 -0500
|
|
Subject: add pxeboot package
|
|
|
|
---
|
|
SOURCES/grub.macros | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 5581deb..9ef91d6 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -222,6 +222,13 @@ Summary: Unsigned versions of GRUB EFI binaries \
|
|
%description %{1}-unsigned \
|
|
This package contains unsigned version of GRUB EFI binaries. \
|
|
\
|
|
+%package %{1}-pxeboot \
|
|
+Summary: PXE bootable GRUB EFI binaries \
|
|
+ \
|
|
+%description %{1}-pxeboot \
|
|
+This package contains the version of EFI GRUB that is served by the pxeboot \
|
|
+server \
|
|
+ \
|
|
%{nil}
|
|
|
|
%global do_common_setup() \
|
|
@@ -394,6 +401,7 @@ ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \
|
|
install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \
|
|
install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \
|
|
+install -D -m 755 %{2} $RPM_BUILD_ROOT/pxeboot/EFI/%{2} \
|
|
install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \
|
|
install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
|
|
install -D -m 644 unicode.pf2 \\\
|
|
@@ -488,4 +496,8 @@ cd .. \
|
|
%{expand:%%files %{1}-unsigned} \
|
|
/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \
|
|
/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \
|
|
+ \
|
|
+%{expand:%%files %{1}-pxeboot} \
|
|
+/pxeboot/EFI/%{grubefiname} \
|
|
+ \
|
|
%{nil}
|
|
--
|
|
2.7.4
|
|
|