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

Accepting request 286432 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/286432
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=110
This commit is contained in:
Dominique Leuenberger 2015-02-20 12:50:50 +00:00 committed by Git OBS Bridge
parent f70701b489
commit 90f382c318
2 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
grub2.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Feb 16 16:25:50 UTC 2015 - arvidjaar@gmail.com
- add luks, gcry_rijndael, gcry_sha1 to signed EFI image to support
LUKS partition in default setup (boo#917427)
-------------------------------------------------------------------
Thu Feb 5 09:37:46 UTC 2015 - mchang@suse.com
- enable i386-xen (boo#891043)
-------------------------------------------------------------------
Wed Feb 4 07:43:27 UTC 2015 - mchang@suse.com

37
grub2.spec
View File

@ -55,6 +55,8 @@ BuildRequires: xz-devel
BuildRequires: openssl >= 0.9.8
BuildRequires: pesign-obs-integration
%endif
%endif
%ifarch %{ix86} x86_64
BuildRequires: xen-devel
%endif
@ -107,6 +109,14 @@ BuildRequires: xen-devel
%endif
%endif
%ifarch %{ix86}
%define grubxenarch i386-xen
%endif
%ifarch x86_64
%define grubxenarch x86_64-xen
%endif
%if 0%{?suse_version} == 1110
%define only_efi %{nil}
%define only_x86_64 %{nil}
@ -306,16 +316,16 @@ provides support for EFI systems.
%endif
%ifarch x86_64
%ifarch %{ix86} x86_64
%package %{_target_cpu}-xen
%package %{grubxenarch}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System/Boot
Provides: %{name}-xen = %{version}-%{release}
Obsoletes: %{name}-xen < %{version}-%{release}
%description %{_target_cpu}-xen
%description %{grubxenarch}
The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
bootloader with modular architecture. It supports rich variety of kernel formats,
file systems, computer architectures and hardware devices. This subpackage
@ -433,7 +443,7 @@ mkdir build
%ifarch %{efi}
mkdir build-efi
%endif
%ifarch x86_64
%ifarch %{ix86} x86_64
mkdir build-xen
%endif
@ -452,7 +462,7 @@ FFLAGS=" "
export CFLAGS CXXFLAGS FFLAGS
export HOST_CFLAGS=$RPM_OPT_FLAGS
%ifarch x86_64
%ifarch %{ix86} x86_64
cd build-xen
../configure \
TARGET_LDFLAGS=-static \
@ -478,7 +488,7 @@ elif search -s root -f /boot/grub/menu.lst ; then
legacy_configfile /boot/grub/menu.lst
fi
EOF
./grub-mkstandalone --grub-mkimage=./grub-mkimage -o grub.xen -O %{_target_cpu}-xen -d grub-core/ "/boot/grub/grub.cfg=./grub.cfg"
./grub-mkstandalone --grub-mkimage=./grub-mkimage -o grub.xen -O %{grubxenarch} -d grub-core/ "/boot/grub/grub.cfg=./grub.cfg"
cd ..
%endif
@ -504,6 +514,7 @@ CD_MODULES=" all_video boot cat chain configfile echo \
password_pbkdf2 png reboot search search_fs_uuid \
search_fs_file search_label sleep test video fat loadenv"
PXE_MODULES="efinet tftp"
CRYPTO_MODULES="luks gcry_rijndael gcry_sha1"
%ifarch x86_64
CD_MODULES="${CD_MODULES} linuxefi"
@ -511,7 +522,7 @@ CD_MODULES="${CD_MODULES} linuxefi"
CD_MODULES="${CD_MODULES} linux"
%endif
GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} mdraid09 mdraid1x lvm"
GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} ${CRYPTO_MODULES} mdraid09 mdraid1x lvm"
./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= \
-d grub-core ${GRUB_MODULES}
#./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus fat \
@ -576,10 +587,10 @@ make %{?_smp_mflags}
%install
%ifarch x86_64
%ifarch %{ix86} x86_64
cd build-xen
make DESTDIR=$RPM_BUILD_ROOT install
install -m 644 grub.xen $RPM_BUILD_ROOT%{_libdir}/%{name}/%{_target_cpu}-xen/.
install -m 644 grub.xen $RPM_BUILD_ROOT%{_libdir}/%{name}/%{grubxenarch}/.
cd ..
%endif
@ -943,10 +954,10 @@ fi
%config %{_sysconfdir}/grub.d/80_suse_btrfs_snapshot
%{_libdir}/snapper/plugins/grub
%ifarch x86_64
%files %{_target_cpu}-xen
%dir %{_libdir}/%{name}/%{_target_cpu}-xen
%{_libdir}/%{name}/%{_target_cpu}-xen/*
%ifarch %{ix86} x86_64
%files %{grubxenarch}
%dir %{_libdir}/%{name}/%{grubxenarch}
%{_libdir}/%{name}/%{grubxenarch}/*
%endif
%changelog