pool/grub2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 450660 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/450660
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=149
This commit is contained in:
Dominique Leuenberger 2017-01-19 09:38:17 +00:00 committed by Git OBS Bridge
commit 74f10676ef
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
grub2.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Jan 16 10:15:52 UTC 2017 - matwey.kornilov@gmail.com
- Add serial module to efi image.
Serial terminal is still useful even with EFI Secure Boot
-------------------------------------------------------------------
Wed Jan 11 06:58:56 UTC 2017 - mchang@suse.com
- Support %posttrans with marcos provided by update-bootloader-rpm-macros
package (bsc#997317)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 4 08:48:56 UTC 2017 - mchang@suse.com Wed Jan 4 08:48:56 UTC 2017 - mchang@suse.com

35
grub2.spec
View File

@ -57,6 +57,9 @@ BuildRequires: pesign-obs-integration
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
%define has_systemd 1 %define has_systemd 1
%endif %endif
%if 0%{?suse_version} > 1320
BuildRequires: update-bootloader-rpm-macros
%endif
# Modules code is dynamically loaded and collected from a _fixed_ path. # Modules code is dynamically loaded and collected from a _fixed_ path.
%define _libdir %{_exec_prefix}/lib %define _libdir %{_exec_prefix}/lib
@ -298,8 +301,12 @@ Summary: Bootloader with support for Linux, Multiboot and more
Group: System/Boot Group: System/Boot
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires(post): %{name} = %{version}-%{release} Requires(post): %{name} = %{version}-%{release}
%if 0%{?update_bootloader_requires:1}
%update_bootloader_requires
%else
Requires: perl-Bootloader Requires: perl-Bootloader
Requires(post): perl-Bootloader Requires(post): perl-Bootloader
%endif
%ifarch s390x %ifarch s390x
# required utilities by grub2-s390x-04-grub2-install.patch # required utilities by grub2-s390x-04-grub2-install.patch
# use 'showconsole' to determine console device. (bnc#876743) # use 'showconsole' to determine console device. (bnc#876743)
@ -337,8 +344,12 @@ Requires(post): efibootmgr
%endif %endif
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires(post): %{name} = %{version}-%{release} Requires(post): %{name} = %{version}-%{release}
%if 0%{?update_bootloader_requires:1}
%update_bootloader_requires
%else
Requires: perl-Bootloader >= 0.706 Requires: perl-Bootloader >= 0.706
Requires(post): perl-Bootloader >= 0.706 Requires(post): perl-Bootloader >= 0.706
%endif
Provides: %{name}-efi = %{version}-%{release} Provides: %{name}-efi = %{version}-%{release}
Obsoletes: %{name}-efi < %{version}-%{release} Obsoletes: %{name}-efi < %{version}-%{release}
@ -566,7 +577,7 @@ CD_MODULES="${CD_MODULES} linuxefi"
CD_MODULES="${CD_MODULES} linux" CD_MODULES="${CD_MODULES} linux"
%endif %endif
GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} ${CRYPTO_MODULES} mdraid09 mdraid1x lvm" GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} ${CRYPTO_MODULES} mdraid09 mdraid1x lvm serial"
./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= \ ./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= \
-d grub-core ${GRUB_MODULES} -d grub-core ${GRUB_MODULES}
#./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus fat \ #./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus fat \
@ -765,6 +776,9 @@ perl -ni -e '
%if ! 0%{?only_efi:1} %if ! 0%{?only_efi:1}
%post %{grubarch} %post %{grubarch}
%if 0%{?update_bootloader_check_type_reinit_post:1}
%update_bootloader_check_type_reinit_post grub2
%else
# To check by current loader settings # To check by current loader settings
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
. %{_sysconfdir}/sysconfig/bootloader . %{_sysconfdir}/sysconfig/bootloader
@ -808,10 +822,17 @@ elif [ "x${LOADER_TYPE}" = "xgrub2" ]; then
fi fi
%endif %endif
%posttrans %{grubarch}
%{?update_bootloader_posttrans}
%endif
%ifarch %{efi} %ifarch %{efi}
%post %{grubefiarch} %post %{grubefiarch}
%if 0%{?update_bootloader_check_type_reinit_post:1}
%update_bootloader_check_type_reinit_post grub2-efi
%else
# To check by current loader settings # To check by current loader settings
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
. %{_sysconfdir}/sysconfig/bootloader . %{_sysconfdir}/sysconfig/bootloader
@ -842,13 +863,21 @@ fi
exit 0 exit 0
%endif %endif
%posttrans %{grubefiarch}
%{?update_bootloader_posttrans}
%endif
%preun %preun
%service_del_preun grub2-once.service %service_del_preun grub2-once.service
if [ $1 = 0 ]; then if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || :
/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
%if ! 0%{?only_efi:1} # 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}
# To check by current loader settings # To check by current loader settings
if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
. %{_sysconfdir}/sysconfig/bootloader . %{_sysconfdir}/sysconfig/bootloader