Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory
checked in at Mon Mar 15 00:44:58 CET 2010.
--------
--- grub2/grub2.changes 2010-02-12 09:28:49.000000000 +0100
+++ /mounts/work_src_done/STABLE/grub2/grub2.changes 2010-03-14 13:12:49.000000000 +0100
@@ -1,0 +2,16 @@
+Sun Mar 14 12:11:53 UTC 2010 - aj@suse.de
+
+- Fix build on x86-64.
+
+-------------------------------------------------------------------
+Fri Mar 12 20:39:25 UTC 2010 - aj@suse.de
+
+- Don't build parallel.
+- Update to grub 1.98 including:
+ * Multiboot on EFI support.
+ * Saved default menu entry support, with new utilities `grub-reboot' and
+ `grub-set-default'.
+ * Encrypted password support, with a new utility `grub-mkpasswd-pbkdf2'.
+ * `grub-mkfloppy' removed; use `grub-mkrescue' to create floppy images.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
grub-1.97.2.tar.gz
grub2-dlsym-v4.patch
New:
----
gccwarn.patch
grub-1.98.tar.gz
grub2.rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.w1yCwv/_old 2010-03-15 00:44:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w1yCwv/_new 2010-03-15 00:44:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package grub2 (Version 1.97.2)
+# spec file for package grub2 (Version 1.98)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,14 +24,16 @@
BuildRequires: freetype2-devel gcc glibc-devel libncurses5 libusb-1_0-devel ncurses-devel
%endif
BuildRequires: bison flex ruby
+
# Modules always contain just 32-bit code
%define _libdir %{_exec_prefix}/lib
+
# 64-bit x86-64 machines use 32-bit boot loader
# (We cannot just redefine _target_cpu, as we'd get i386.rpm packages then)
%ifarch x86_64
%define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu}
%endif
-Version: 1.97.2
+Version: 1.98
Release: 1
Summary: Bootloader with support for Linux, Multiboot and more
Group: System/Boot
@@ -41,11 +43,14 @@
Source1: 90_persistent
Source2: grub.default
Source3: README.openSUSE
+Source4: grub2.rpmlintrc
Patch0: grub-1.95-grubdir.patch
-Patch1: grub2-dlsym-v4.patch
Patch2: grub2-linux.patch
+Patch3: gccwarn.patch
PreReq: perl-Bootloader
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
# TODO: ppc
ExclusiveArch: %{ix86} x86_64
@@ -64,35 +69,45 @@
%prep
%setup -q -n grub-%{version}
-%patch0 -p1 -b .grubdir
-%patch1 -p1 -b .dlsym
+%patch0 -p0 -b .grubdir
%patch2 -p0 -b .linux
+%patch3 -p0 -b .gccwarn
+
# README.openSUSE
cp %{SOURCE3} .
%build
-sh autogen.sh
+#sh autogen.sh
# -static is needed so that autoconf script is able to link
# test that looks for _start symbol on 64 bit platforms
%configure TARGET_LDFLAGS=-static \
--with-platform=pc \
- --enable-grub-emu \
+ --enable-grub-emu-usb \
--program-transform-name=s,grub,%{name},
-%__make %{?jobs:-j%jobs}
+
+make
%install
make DESTDIR=$RPM_BUILD_ROOT install
+
# Script that makes part of grub.cfg persist across updates
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/
+
# Ghost config file
install -d $RPM_BUILD_ROOT/boot/%{name}
touch $RPM_BUILD_ROOT/boot/%{name}/grub.cfg
ln -s ../boot/%{name}/grub.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.cfg
+
# XXX: Remove for now, should be renamed to grub2.info
rm $RPM_BUILD_ROOT/%{_infodir}/grub.info*
+# Remove devel files
+rm $RPM_BUILD_ROOT/%{_libdir}/%{name}/*/*.h
+
# Defaults
install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub
-#%post
+%find_lang grub
+
+%post
exec >/dev/null 2>&1
# Create device.map or reuse one from GRUB Legacy
if [ -e /boot/grub/device.map ] ; then
@@ -120,6 +135,7 @@
rm -f /boot/%{name}/*.lst
rm -f /boot/%{name}/device.map
fi
+
#%triggerin -- kernel, kernel-PAE
#exec >/dev/null 2>&1
## Generate grub.cfg
@@ -131,22 +147,28 @@
## Generate grub.cfg
#%{name}-mkconfig
-%files
+%files -f grub.lang
%defattr(-,root,root,-)
%{_libdir}/%{name}
%{_libdir}/grub/
%{_sbindir}/%{name}-mkdevicemap
%{_sbindir}/%{name}-install
-%{_sbindir}/%{name}-emu
%{_sbindir}/%{name}-probe
%{_sbindir}/%{name}-setup
%{_sbindir}/%{name}-mkconfig
+%{_sbindir}/%{name}-reboot
+%{_sbindir}/%{name}-set-default
+%{_bindir}/%{name}-bin2h
+%{_bindir}/%{name}-mkisofs
+%{_bindir}/%{name}-mkrelpath
+%{_bindir}/%{name}-script-check
%{_bindir}/%{name}-mkimage
%{_bindir}/%{name}-mkelfimage
%{_bindir}/%{name}-editenv
%{_bindir}/%{name}-fstest
%{_bindir}/%{name}-mkfont
%{_bindir}/%{name}-mkrescue
+%{_bindir}/%{name}-mkpasswd-pbkdf2
%dir %{_sysconfdir}/grub.d
%config %{_sysconfdir}/grub.d/??_*
%{_sysconfdir}/grub.d/README
++++++ gccwarn.patch ++++++
Index: lib/libgcrypt-grub/cipher/camellia.c
===================================================================
--- lib/libgcrypt-grub/cipher/camellia.c.orig
+++ lib/libgcrypt-grub/cipher/camellia.c
@@ -25,11 +25,9 @@
* http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
*/
-
+#include "memory.h"
#include "camellia.h"
-/* u32 must be 32bit word */
-typedef unsigned int u32;
typedef unsigned char u8;
/* key constants */
++++++ grub-1.95-grubdir.patch ++++++
--- /var/tmp/diff_new_pack.w1yCwv/_old 2010-03-15 00:44:41.000000000 +0100
+++ /var/tmp/diff_new_pack.w1yCwv/_new 2010-03-15 00:44:41.000000000 +0100
@@ -4,9 +4,11 @@
Lubomir Rintel