Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2015-02-20 13:50:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2015-02-06 10:56:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2015-02-20 13:50:51.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 16 16:25:50 UTC 2015 - [email protected] + +- 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 - [email protected] + +- enable i386-xen (boo#891043) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2.spec ++++++ --- /var/tmp/diff_new_pack.nMT5YR/_old 2015-02-20 13:50:53.000000000 +0100 +++ /var/tmp/diff_new_pack.nMT5YR/_new 2015-02-20 13:50:53.000000000 +0100 @@ -55,6 +55,8 @@ BuildRequires: openssl >= 0.9.8 BuildRequires: pesign-obs-integration %endif +%endif +%ifarch %{ix86} x86_64 BuildRequires: xen-devel %endif @@ -107,6 +109,14 @@ %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 @@ %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 @@ %ifarch %{efi} mkdir build-efi %endif -%ifarch x86_64 +%ifarch %{ix86} x86_64 mkdir build-xen %endif @@ -452,7 +462,7 @@ 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 @@ 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 @@ 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} 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 @@ %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 @@ %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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
