rpms
/
efi-rpm-macros
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't use efi-rpm-macros definitions for paths 

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-05-02 11:27:31 -04:00
parent 4d38fc3896
commit 700a7cbdab
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0010-efi-rpm-macros.spec-don-t-use-efi-rpm-macros-definit.patch Normal file
View File

@ -0,0 +1,33 @@
From 625cc7b2fdba3e489865c42fddc48b72b3bfecd4 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 2 May 2018 11:26:04 -0400
Subject: [PATCH 10/10] efi-rpm-macros.spec: don't use efi-rpm-macros
definitions for paths
Signed-off-by: Peter Jones <pjones@redhat.com>
---
efi-rpm-macros.spec.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/efi-rpm-macros.spec.in b/efi-rpm-macros.spec.in
index fce2f5ff296..1835d20e08f 100644
--- a/efi-rpm-macros.spec.in
+++ b/efi-rpm-macros.spec.in
@@ -60,10 +60,10 @@ machine bootloaders and tools.
%files -n efi-filesystem
%defattr(0700,root,root,-)
-%dir %{efi_esp_root}
-%dir %{efi_esp_efi}
-%dir %{efi_esp_dir}
-%dir %{efi_esp_boot}
+%dir /boot/efi
+%dir /boot/efi/EFI
+%dir /boot/efi/EFI/BOOT
+%dir /boot/efi/EFI/%{_efi_vendor_}
%changelog
* Tue May 01 2018 Peter Jones <pjones@redhat.com> - 2-1
--
2.14.3

9
efi-rpm-macros.spec
View File

@ -20,6 +20,7 @@ Patch0006: 0006-efi_arch-turns-out-nil-is-definitely-not-what-we-wan.patch
Patch0007: 0007-Make-a-macros.efi-srpm-that-defines-efi.patch
Patch0008: 0008-Add-efi_has_alt_arch-0-or-1.patch
Patch0009: 0009-Add-efi-filesystem-subpackage.patch
Patch0010: 0010-efi-rpm-macros.spec-don-t-use-efi-rpm-macros-definit.patch
%global debug_package %{nil}
%global _efi_vendor_ %(eval sed -n -e 's/rhel/redhat/' -e 's/^ID=//p' /etc/os-release)
@ -69,10 +70,10 @@ machine bootloaders and tools.
%files -n efi-filesystem
%defattr(0700,root,root,-)
%dir %{efi_esp_root}
%dir %{efi_esp_efi}
%dir %{efi_esp_dir}
%dir %{efi_esp_boot}
%dir /boot/efi
%dir /boot/efi/EFI
%dir /boot/efi/EFI/BOOT
%dir /boot/efi/EFI/%{_efi_vendor_}
%changelog
* Wed May 02 2018 Peter Jones <pjones@redhat.com> - 2-5