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>
58 lines
2.6 KiB
Diff
58 lines
2.6 KiB
Diff
From fadbfe260a2678e1a6e79f8df4372b2eaee5dc9f Mon Sep 17 00:00:00 2001
|
|
From: root <root@yow-cgts4-lx.wrs.com>
|
|
Date: Tue, 23 Jan 2018 14:46:01 -0500
|
|
Subject: add unsigned package
|
|
|
|
---
|
|
SOURCES/grub.macros | 15 +++++++++++++++
|
|
1 file changed, 15 insertions(+)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index 075727c..5581deb 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -215,6 +215,13 @@ Requires: %{name}-common = %{evr} \
|
|
%{expand:%%description %{1}-cdboot} \
|
|
%{desc} \
|
|
This subpackage provides optional components of grub used with removeable media on %{1} systems.\
|
|
+ \
|
|
+%package %{1}-unsigned \
|
|
+Summary: Unsigned versions of GRUB EFI binaries \
|
|
+ \
|
|
+%description %{1}-unsigned \
|
|
+This package contains unsigned version of GRUB EFI binaries. \
|
|
+ \
|
|
%{nil}
|
|
|
|
%global do_common_setup() \
|
|
@@ -289,6 +296,8 @@ done \
|
|
-p /EFI/%{efidir} -d grub-core ${GRUB_MODULES} \
|
|
%{4}./grub-mkimage -O %{1} -o %{3}.orig \\\
|
|
-p /EFI/BOOT -d grub-core ${GRUB_MODULES} \
|
|
+cp %{2}.orig %{2}.unsigned \
|
|
+cp %{3}.orig %{3}.unsigned \
|
|
%{expand:%%{pesign -s -i %{2}.orig -o %{2} -a %{5} -c %{6} -n %{7}}} \
|
|
%{expand:%%{pesign -s -i %{3}.orig -o %{3} -a %{5} -c %{6} -n %{7}}} \
|
|
%{nil}
|
|
@@ -383,6 +392,8 @@ find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;' \
|
|
touch $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.cfg \
|
|
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 -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 \\\
|
|
@@ -473,4 +484,8 @@ cd .. \
|
|
%defattr(-,root,root,-) \
|
|
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/%{3} \
|
|
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \
|
|
+ \
|
|
+%{expand:%%files %{1}-unsigned} \
|
|
+/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \
|
|
+/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \
|
|
%{nil}
|
|
--
|
|
2.7.4
|
|
|