![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory
checked in at Mon May 9 10:48:43 CEST 2011.
--------
--- grub2/grub2.changes 2010-10-27 16:59:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/grub2/grub2.changes 2011-05-07 14:25:44.000000000 +0200
@@ -1,0 +2,9 @@
+Sat May 7 12:33:43 CEST 2011 - jslaby@suse.de
+
+- fix build with gcc 4.6
+- build in parallel (fixed finally in 1.99)
+- add translations from translations project
+- update to 1.99-rc2
+ * See NEWS file for changes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
grub-1.95-grubdir.patch
grub-1.98-follow-dev-mapper-symlinks.patch
grub-1.98.tar.bz2
New:
----
gcc46-fixes.patch
grub-1.99~rc2.tar.xz
translations-20110507.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.d68VQi/_old 2011-05-09 10:43:31.000000000 +0200
+++ /var/tmp/diff_new_pack.d68VQi/_new 2011-05-09 10:43:31.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package grub2 (Version 1.98)
+# spec file for package grub2
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,13 @@
Name: grub2
%ifarch x86_64
-BuildRequires: freetype2-devel-32bit gcc-32bit glibc-devel-32bit libncurses5-32bit libusb-1_0-devel-32bit ncurses-devel-32bit
+BuildRequires: freetype2-devel-32bit gcc-32bit glibc-32bit glibc-devel-32bit
+BuildRequires: libncurses5-32bit libusb-1_0-devel-32bit ncurses-devel-32bit
%else
-BuildRequires: freetype2-devel gcc glibc-devel libncurses5 libusb-1_0-devel ncurses-devel
+BuildRequires: freetype2-devel gcc glibc-devel libncurses5 libusb-1_0-devel
+BuildRequires: ncurses-devel
%endif
-BuildRequires: bison flex ruby
+BuildRequires: bison device-mapper-devel flex lzma ruby xz
# Modules always contain just 32-bit code
%define _libdir %{_exec_prefix}/lib
@@ -33,23 +35,27 @@
%ifarch x86_64
%define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu}
%endif
-Version: 1.98
-Release: 9
+Version: 1.98.99.rc2
+Release: 1
+%define tar_version 1.99~rc2
Summary: Bootloader with support for Linux, Multiboot and more
Group: System/Boot
License: GPLv3+
Url: http://www.gnu.org/software/grub/
-Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{version}.tar.bz2
+Source0: ftp://alpha.gnu.org/gnu/grub/grub-%{tar_version}.tar.xz
Source1: 90_persistent
Source2: grub.default
Source3: README.openSUSE
Source4: grub2.rpmlintrc
-Patch0: grub-1.95-grubdir.patch
+# rsync -Lrtvz translationproject.org::tp/latest/grub/ po
+Source5: translations-20110507.tar.bz2
+Patch0: gcc46-fixes.patch
Patch2: grub2-linux.patch
Patch3: gccwarn.patch
-Patch4: grub-1.98-follow-dev-mapper-symlinks.patch
PreReq: perl-Bootloader
Requires: gettext-runtime
+Requires(post): /sbin/install-info
+Requires(preun):/sbin/install-info
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -70,17 +76,26 @@
%prep
-%setup -q -n grub-%{version}
-%patch0 -p0 -b .grubdir
-%patch2 -p0 -b .linux
-%patch3 -p0 -b .gccwarn
-%patch4 -p1 -b .dev-mapper
+%setup -q -n grub-%{tar_version} -a 5
+(cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS
+sed 's,@setfilename grub.info,@setfilename grub2.info,' docs/grub.texi >docs/grub2.texi
+sed -i 's,grub.texi,grub2.texi,' docs/Makefile.am
+%patch0 -p1
+%patch2 -p0
+%patch3 -p1
# README.openSUSE
cp %{SOURCE3} .
%build
-#sh autogen.sh
+#./autogen.sh
+
+# we don't want to let rpm to override *FLAGS by bogus ones
+CFLAGS=" "
+CXXFLAGS=" "
+FFLAGS=" "
+export CFLAGS CXXFLAGS FFLAGS
+
# -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 \
@@ -88,7 +103,7 @@
--enable-grub-emu-usb \
--program-transform-name=s,grub,%{name},
-make
+make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
@@ -101,8 +116,6 @@
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
@@ -111,6 +124,9 @@
%find_lang grub
%post
+/sbin/install-info %{_infodir}/grub-dev.info %{_infodir}/dir || :
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
mkdir -p /boot/%{name}/ 2>/dev/null || true
# Create device.map or reuse one from GRUB Legacy
if [ ! -e /boot/%{name}/device.map ] ; then
@@ -131,10 +147,15 @@
fi
%preun
+if [ $1 = 0 ]; then
+ /sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || :
+ /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
exec >/dev/null
if [ -e /boot/%{name}/core.img ] ; then
- /sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2"
- /sbin/update-bootloader --refresh
+ /sbin/update-bootloader --remove --image /boot/%{name}/core.img --name="GNU GRUB 2" || :
+ /sbin/update-bootloader --refresh || :
## XXX Ugly
rm -f /boot/%{name}/*.mod
rm -f /boot/%{name}/*.img
@@ -142,50 +163,35 @@
rm -f /boot/%{name}/device.map
fi
-#%triggerin -- kernel, kernel-PAE
+#%%triggerin -- kernel, kernel-PAE
#exec >/dev/null 2>&1
## Generate grub.cfg
-#%{name}-mkconfig
+#%%{name}-mkconfig
#
#
-#%triggerun -- kernel, kernel-PAE
+#%%triggerun -- kernel, kernel-PAE
#exec >/dev/null 2>&1
## Generate grub.cfg
-#%{name}-mkconfig
+#%%{name}-mkconfig
%files -f grub.lang
%defattr(-,root,root,-)
%{_libdir}/%{name}
%{_libdir}/grub/
-%{_sbindir}/%{name}-mkdevicemap
-%{_sbindir}/%{name}-install
-%{_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
+%{_sbindir}/%{name}-*
+%{_bindir}/%{name}-*
+%{_sysconfdir}/bash_completion.d/grub
+%config %{_sysconfdir}/default/grub
%dir %{_sysconfdir}/grub.d
-%config %{_sysconfdir}/grub.d/??_*
%{_sysconfdir}/grub.d/README
+%config %{_sysconfdir}/grub.d/??_*
%{_sysconfdir}/%{name}.cfg
-%config %{_sysconfdir}/default/grub
%dir /boot/%{name}
# Actually, this is replaced by update-grub from scriptlets,
# but it takes care of modified persistent part
%config(noreplace) /boot/%{name}/grub.cfg
%doc COPYING INSTALL NEWS README THANKS TODO ChangeLog README.openSUSE
-#%exclude %{_mandir}
-#%{_infodir}/%{name}.info*
+%{_infodir}/grub-dev.info*
+%{_infodir}/%{name}.info*
%changelog
++++++ gcc46-fixes.patch ++++++
---
include/grub/test.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/include/grub/test.h
+++ b/include/grub/test.h
@@ -49,8 +49,7 @@ int grub_test_run (grub_test_t test);
/* Test `cond' for nonzero; log failure otherwise. */
void grub_test_nonzero (int cond, const char *file,
const char *func, grub_uint32_t line,
- const char *fmt, ...)
- __attribute__ ((format (printf, 5, 6)));
+ const char *fmt, ...);
/* Macro to fill in location details and an optional error message. */
#define grub_test_assert(cond, ...) \
++++++ gccwarn.patch ++++++
--- /var/tmp/diff_new_pack.d68VQi/_old 2011-05-09 10:43:31.000000000 +0200
+++ /var/tmp/diff_new_pack.d68VQi/_new 2011-05-09 10:43:31.000000000 +0200
@@ -1,12 +1,27 @@
-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
- */
+---
+ grub-core/lib/libgcrypt-grub/cipher/camellia.c | 3 +--
+ grub-core/lib/libgcrypt/cipher/camellia.c | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+--- a/grub-core/lib/libgcrypt-grub/cipher/camellia.c
++++ b/grub-core/lib/libgcrypt-grub/cipher/camellia.c
+@@ -29,9 +29,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
+
+
+ #include "camellia.h"
++#include "memory.h"
+
+-/* u32 must be 32bit word */
+-typedef unsigned int u32;
+ typedef unsigned char u8;
+
+ /* key constants */
+--- a/grub-core/lib/libgcrypt/cipher/camellia.c
++++ b/grub-core/lib/libgcrypt/cipher/camellia.c
+@@ -26,10 +26,9 @@
+ #include