From 05861f0e0c9e3b231f03784a27abf54ab3817fc24a99ad19b4527a9628c43e07 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Wed, 26 Apr 2023 07:47:52 +0000 Subject: [PATCH] Accepting request 1082901 from home:gary_lin:branches:Base:System - Exclude the deprecated EFI location, /usr/lib64/efi/, from Tumbleweed and ALP OBS-URL: https://build.opensuse.org/request/show/1082901 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=453 --- grub2.changes | 6 ++++++ grub2.spec | 2 ++ 2 files changed, 8 insertions(+) diff --git a/grub2.changes b/grub2.changes index 234b0c1..4d0f4ba 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 26 07:22:03 UTC 2023 - Gary Ching-Pang Lin + +- Exclude the deprecated EFI location, /usr/lib64/efi/, from + Tumbleweed and ALP + ------------------------------------------------------------------- Fri Apr 21 07:53:30 UTC 2023 - Gary Ching-Pang Lin diff --git a/grub2.spec b/grub2.spec index 0ed977c..49e90c8 100644 --- a/grub2.spec +++ b/grub2.spec @@ -1051,6 +1051,7 @@ ln -srf %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}/%{ %define sysefidir %{sysefibasedir}/%{_target_cpu} install -d %{buildroot}/%{sysefidir} ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi %{buildroot}%{sysefidir}/grub.efi +%if 0%{?suse_version} < 1600 %ifarch x86_64 # provide compatibility sym-link for previous shim-install and the like install -d %{buildroot}/usr/lib64/efi @@ -1061,6 +1062,7 @@ cat <<-EoM >%{buildroot}/usr/lib64/efi/DEPRECATED may vanish at any point in time. Please use the new location! EoM %endif +%endif %ifarch x86_64 aarch64 export BRP_PESIGN_FILES="%{_datadir}/%{name}/%{grubefiarch}/grub.efi"