From 5b3a8d371061b70104d81bf35d88de2fd07e2106c6cb3d24ea7a92dfc4e75a96 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Fri, 27 Mar 2020 06:45:43 +0000 Subject: [PATCH 1/2] Accepting request 788887 from home:gary_lin:branches:devel:openSUSE:Factory Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523) OBS-URL: https://build.opensuse.org/request/show/788887 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim-leap?expand=0&rev=17 --- shim-leap.changes | 6 ++++++ shim-leap.spec | 30 ++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/shim-leap.changes b/shim-leap.changes index 879cecf..4aeed7d 100644 --- a/shim-leap.changes +++ b/shim-leap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 27 05:32:11 UTC 2020 - Gary Ching-Pang Lin + +- Move 'efi'-executables to '/usr/share/efi' + (FATE#326960, bsc#1166523) + ------------------------------------------------------------------- Thu Dec 6 03:23:04 UTC 2018 - Gary Ching-Pang Lin diff --git a/shim-leap.spec b/shim-leap.spec index 3962d8f..51ab173 100644 --- a/shim-leap.spec +++ b/shim-leap.spec @@ -1,7 +1,7 @@ # # spec file for package shim-leap # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,14 @@ # +# Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523) +%define sysefibasedir %{_datadir}/efi +%define sysefidir %{sysefibasedir}/%{_target_cpu} +%if 0%{?sle_version} < 160000 +# provide compatibility sym-link for residual kiwi, etc. +%define shim_lib64_share_compat 1 +%endif + Name: shim-leap Version: 14 Release: 0 @@ -49,13 +57,31 @@ rpm2cpio %{SOURCE0} | cpio --extract --unconditional --preserve-modification-tim cp -a * %{buildroot} install -m 755 %{SOURCE1} %{buildroot}/%{_sbindir} +# Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523) +install -d %{buildroot}/%{sysefidir} +mv %{buildroot}/usr/lib64/efi/* %{buildroot}/%{sysefidir} +%if %{defined shim_lib64_share_compat} +ln -srf %{buildroot}/%{sysefidir}/*.efi %{buildroot}/usr/lib64/efi/ +%endif + %post -n shim /sbin/update-bootloader --reinit || true %files -n shim +%dir %{?sysefibasedir} +%dir %{sysefidir} +%{sysefidir}/shim.efi +%{sysefidir}/shim-*.efi +%{sysefidir}/shim-*.der +%{sysefidir}/MokManager.efi +%{sysefidir}/fallback.efi +%if %{defined shim_lib64_share_compat} +# provide compatibility sym-link for previous kiwi, etc. +%dir /usr/lib64/efi +/usr/lib64/efi/*.efi +%endif /etc/uefi /usr/sbin/shim-install -/usr/lib64/efi /usr/share/doc/packages/shim %changelog From 049deae41cf0055046a21196b39d75827e21521c47e23c9b58cd413b93f15da3 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Mon, 30 Mar 2020 06:34:39 +0000 Subject: [PATCH 2/2] Accepting request 789644 from home:gary_lin:branches:devel:openSUSE:Factory Use "suse_version" instead of "sle_version" to avoid shim_lib64_share_compat being set in Tumbleweed forever. OBS-URL: https://build.opensuse.org/request/show/789644 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim-leap?expand=0&rev=18 --- shim-leap.changes | 6 ++++++ shim-leap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/shim-leap.changes b/shim-leap.changes index 4aeed7d..4648c4b 100644 --- a/shim-leap.changes +++ b/shim-leap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 30 06:05:58 UTC 2020 - Gary Ching-Pang Lin + +- Use "suse_version" instead of "sle_version" to avoid + shim_lib64_share_compat being set in Tumbleweed forever. + ------------------------------------------------------------------- Fri Mar 27 05:32:11 UTC 2020 - Gary Ching-Pang Lin diff --git a/shim-leap.spec b/shim-leap.spec index 51ab173..2981f24 100644 --- a/shim-leap.spec +++ b/shim-leap.spec @@ -19,7 +19,7 @@ # Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523) %define sysefibasedir %{_datadir}/efi %define sysefidir %{sysefibasedir}/%{_target_cpu} -%if 0%{?sle_version} < 160000 +%if 0%{?suse_version} < 1600 # provide compatibility sym-link for residual kiwi, etc. %define shim_lib64_share_compat 1 %endif