Accepting request 789646 from devel:openSUSE:Factory
- Move 'efi'-executables to '/usr/share/efi' (FATE#326960, bsc#1166523) - 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/789646 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shim-leap?expand=0&rev=10
This commit is contained in:
commit
3d71548716
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 30 06:05:58 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
|
||||
|
||||
- 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 <glin@suse.com>
|
||||
|
||||
- Move 'efi'-executables to '/usr/share/efi'
|
||||
(FATE#326960, bsc#1166523)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Dec 6 03:23:04 UTC 2018 - Gary Ching-Pang Lin <glin@suse.com>
|
||||
|
||||
|
@ -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%{?suse_version} < 1600
|
||||
# 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
|
||||
|
Loading…
Reference in New Issue
Block a user