forked from pool/grub2
Accepting request 786172 from home:lnussel:branches:Base:System
- move *.module files to separate -debug subpackage (boo#1166578) - Downgrade mtools to Suggests for consistency with xorriso (boo#1165839) - remove info requirements, file triggers are used now (boo#1152105) OBS-URL: https://build.opensuse.org/request/show/786172 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=351
This commit is contained in:
Michael Chang
Git OBS Bridge
parent
4199d06bb8
commit
f9380bffdc
@ -1,9 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 16 11:42:08 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- move *.module files to separate -debug subpackage (boo#1166578)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 12 08:29:55 UTC 2020 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Fix EFI console detection to make it a runtime decision (bsc#1164385)
|
||||
* grub2-SUSE-Add-the-t-hotkey.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 10 11:59:23 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
|
||||
|
||||
- Downgrade mtools to Suggests for consistency with xorriso (boo#1165839)
|
||||
- remove info requirements, file triggers are used now (boo#1152105)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 28 16:36:57 UTC 2020 - rw@suse.com
|
||||
|
||||
|
||||
61
grub2.spec
61
grub2.spec
@ -300,10 +300,8 @@ Recommends: os-prober
|
||||
# xorriso not available using grub2-mkrescue (bnc#812681)
|
||||
# downgrade to suggest as minimal system can't afford pulling in tcl/tk and half of the x11 stack (bsc#1102515)
|
||||
Suggests: libburnia-tools
|
||||
Recommends: mtools
|
||||
Suggests: mtools
|
||||
%endif
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun):/sbin/install-info
|
||||
%if ! 0%{?only_efi:1}
|
||||
Requires: grub2-%{grubarch} = %{version}-%{release}
|
||||
%endif
|
||||
@ -378,6 +376,20 @@ bootloader with modular architecture. It supports rich variety of kernel format
|
||||
file systems, computer architectures and hardware devices. This subpackage
|
||||
provides support for %{platform} systems.
|
||||
|
||||
%package %{grubarch}-debug
|
||||
Summary: Debug symbols for %{grubarch}
|
||||
Group: System/Boot
|
||||
%if %{platform} != emu
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
Requires: %{name}-%{grubarch} = %{version}
|
||||
|
||||
%description %{grubarch}-debug
|
||||
Debug information for %{name}-%{grubarch}
|
||||
|
||||
Information on how to debug grub can be found online:
|
||||
https://www.cnblogs.com/coryxie/archive/2013/03/12/2956807.html
|
||||
|
||||
%endif
|
||||
|
||||
%ifarch %{efi}
|
||||
@ -408,6 +420,20 @@ bootloader with modular architecture. It supports rich variety of kernel format
|
||||
file systems, computer architectures and hardware devices. This subpackage
|
||||
provides support for EFI systems.
|
||||
|
||||
%package %{grubefiarch}-debug
|
||||
Summary: Debug symbols for %{grubefiarch}
|
||||
Group: System/Boot
|
||||
%if %{platform} != emu
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
Requires: %{name}-%{grubefiarch} = %{version}
|
||||
|
||||
%description %{grubefiarch}-debug
|
||||
Debug symbols for %{name}-%{grubefiarch}
|
||||
|
||||
Information on how to debug grub can be found online:
|
||||
https://www.cnblogs.com/coryxie/archive/2013/03/12/2956807.html
|
||||
|
||||
%endif
|
||||
|
||||
%ifarch %{ix86} x86_64
|
||||
@ -901,8 +927,6 @@ perl -ni -e '
|
||||
|
||||
%post
|
||||
%service_add_post grub2-once.service
|
||||
/sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || :
|
||||
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
|
||||
%if ! 0%{?only_efi:1}
|
||||
|
||||
@ -1001,14 +1025,11 @@ exit 0
|
||||
|
||||
%preun
|
||||
%service_del_preun grub2-once.service
|
||||
if [ $1 = 0 ]; then
|
||||
/sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || :
|
||||
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
|
||||
|
||||
# We did not add core.img to grub1 menu.lst in new update-bootloader macro as what
|
||||
# the old %%post ever did, then the %%preun counterpart which removed the added core.img
|
||||
# entry from old %%post can be skipped entirely if having new macro in use.
|
||||
%if ! 0%{?update_bootloader_posttrans:1}%{?only_efi:1}
|
||||
if [ $1 = 0 ]; then
|
||||
# To check by current loader settings
|
||||
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
|
||||
. %{_sysconfdir}/sysconfig/bootloader
|
||||
@ -1036,8 +1057,8 @@ if [ $1 = 0 ]; then
|
||||
# we have no idea what's been installed. (And a blind remove is dangerous
|
||||
# to remove user's or other package's file accidently ..)
|
||||
fi
|
||||
%endif
|
||||
fi
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%service_del_postun grub2-once.service
|
||||
@ -1175,14 +1196,18 @@ fi
|
||||
%{_datadir}/%{name}/%{grubarch}/*.img
|
||||
%{_datadir}/%{name}/%{grubarch}/*.lst
|
||||
%{_datadir}/%{name}/%{grubarch}/*.mod
|
||||
%{_datadir}/%{name}/%{grubarch}/*.module
|
||||
%ifarch x86_64
|
||||
%{_datadir}/%{name}/%{grubarch}/efiemu*.o
|
||||
%endif
|
||||
%{_datadir}/%{name}/%{grubarch}/gdb_grub
|
||||
%{_datadir}/%{name}/%{grubarch}/gmodule.pl
|
||||
%{_datadir}/%{name}/%{grubarch}/kernel.exec
|
||||
%{_datadir}/%{name}/%{grubarch}/modinfo.sh
|
||||
|
||||
%files %{grubarch}-debug
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/%{name}/%{grubarch}/gdb_grub
|
||||
%{_datadir}/%{name}/%{grubarch}/gmodule.pl
|
||||
%{_datadir}/%{name}/%{grubarch}/*.module
|
||||
|
||||
%endif
|
||||
|
||||
%ifarch %{efi}
|
||||
@ -1197,9 +1222,6 @@ fi
|
||||
%{_datadir}/%{name}/%{grubefiarch}/*.img
|
||||
%{_datadir}/%{name}/%{grubefiarch}/*.lst
|
||||
%{_datadir}/%{name}/%{grubefiarch}/*.mod
|
||||
%{_datadir}/%{name}/%{grubefiarch}/*.module
|
||||
%{_datadir}/%{name}/%{grubefiarch}/gdb_grub
|
||||
%{_datadir}/%{name}/%{grubefiarch}/gmodule.pl
|
||||
%{_datadir}/%{name}/%{grubefiarch}/kernel.exec
|
||||
%{_datadir}/%{name}/%{grubefiarch}/modinfo.sh
|
||||
%dir %{sysefibasedir}
|
||||
@ -1219,6 +1241,13 @@ fi
|
||||
%{sysefidir}/grub.der
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%files %{grubefiarch}-debug
|
||||
%defattr(-,root,root,-)
|
||||
%{_datadir}/%{name}/%{grubefiarch}/gdb_grub
|
||||
%{_datadir}/%{name}/%{grubefiarch}/gmodule.pl
|
||||
%{_datadir}/%{name}/%{grubefiarch}/*.module
|
||||
|
||||
%endif
|
||||
|
||||
%files snapper-plugin
|
||||
|
||||
Loading…
Reference in New Issue
Block a user