589e8020db
This commit results in no change to actual code. It cleans up the following issues in the meta patches: - some patches generated fuzz and offset warnings - patch file names do not match that generated by git format-patch - some patches were not in git format, did not have a proper git header - some patches were not signed off by anybody - file names contained grub2 which is redundant - one patch added a blank line to the end of a file generating a warning, and a subsequent patch removed it. This has now been squashed out. There are 13 patches in total, they were numbered 1-14 with 4 being absent. They are now numbered 1-13. Verification: Built and captured the output, verified that there are no more fuzz and offset warnings. Closes-Bug: 1959037 Change-Id: I8056adf3ee96dc036262aa8c2d9eecfc353cc5ba Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
From dd8a4d64d16ec8f79c768293a4057581b4683803 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <dd8a4d64d16ec8f79c768293a4057581b4683803.1643237526.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <8b5576704440696a7c8f1b00735217bf1745b6a1.1643237526.git.Jim.Somerville@windriver.com>
|
|
References: <8b5576704440696a7c8f1b00735217bf1745b6a1.1643237526.git.Jim.Somerville@windriver.com>
|
|
From: Bin Qian <bin.qian@windriver.com>
|
|
Date: Wed, 29 Sep 2021 16:49:47 -0400
|
|
Subject: [PATCH 13/13] Relocate /pxeboot to /var/pxeboot
|
|
|
|
Relocate writable directory /pxeboot to /var/pxeboot
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
SOURCES/grub.macros | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
|
|
index d52861a..fe88bf1 100644
|
|
--- a/SOURCES/grub.macros
|
|
+++ b/SOURCES/grub.macros
|
|
@@ -410,7 +410,7 @@ ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\
|
|
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \
|
|
install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \
|
|
install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \
|
|
-install -D -m 755 %{2} $RPM_BUILD_ROOT/pxeboot/EFI/%{2} \
|
|
+install -D -m 755 %{2} $RPM_BUILD_ROOT/var/pxeboot/EFI/%{2} \
|
|
install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \
|
|
install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
|
|
install -D -m 700 unicode.pf2 \\\
|
|
@@ -502,6 +502,6 @@ cd .. \
|
|
/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \
|
|
\
|
|
%{expand:%%files %{1}-pxeboot} \
|
|
-/pxeboot/EFI/%{grubefiname} \
|
|
+/var/pxeboot/EFI/%{grubefiname} \
|
|
\
|
|
%{nil}
|
|
--
|
|
2.29.2
|
|
|