Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory
checked in at Tue Aug 2 16:45:17 CEST 2011.



--------
--- grub2/grub2.changes 2011-07-12 16:04:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/grub2/grub2.changes    2011-08-02 
14:12:32.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Aug  2 12:10:39 UTC 2011 - dval...@novell.com
+
+- enable ppc build
+- patch unused-but-set-variable 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  grub2-unused.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.dA54Gf/_old  2011-08-02 16:44:02.000000000 +0200
+++ /var/tmp/diff_new_pack.dA54Gf/_new  2011-08-02 16:44:02.000000000 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           grub2
-%ifarch x86_64
+%ifarch x86_64 ppc64
 BuildRequires:  freetype2-devel-32bit gcc-32bit glibc-32bit glibc-devel-32bit
 BuildRequires:  libncurses5-32bit libusb-1_0-devel-32bit ncurses-devel-32bit
 %else
@@ -35,8 +35,13 @@
 %ifarch x86_64
 %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu}
 %endif
+%ifarch ppc ppc64
+%define platform ieee1275
+%else
+%define platform pc
+%endif
 Version:        1.99
-Release:        2
+Release:        4
 Summary:        Bootloader with support for Linux, Multiboot and more
 Group:          System/Boot
 License:        GPLv3+
@@ -52,6 +57,7 @@
 Patch2:         grub2-linux.patch
 Patch3:         gccwarn.patch
 Patch4:         grub2-linux-submenu.patch
+Patch5:         grub2-unused.patch
 PreReq:         perl-Bootloader
 Requires:       gettext-runtime
 Requires(post): /sbin/install-info
@@ -60,7 +66,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 # TODO: ppc
-ExclusiveArch:  %{ix86} x86_64
+ExclusiveArch:  %{ix86} x86_64 ppc ppc64
 
 %description
 This is the second version of the GRUB (Grand Unified Bootloader),
@@ -83,6 +89,7 @@
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # README.openSUSE
 cp %{SOURCE3} .
@@ -99,7 +106,7 @@
 # -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              \
+        --with-platform=%{platform}     \
         --enable-grub-emu-usb           \
         --program-transform-name=s,grub,%{name},
 


++++++ grub2-unused.patch ++++++
>From 8b424dd42b64453e50a49a4c6fc455584f931b46 Mon Sep 17 00:00:00 2001
From: Fedora Ninjas <pjo...@fedoraproject.org>
Date: Thu, 23 Jun 2011 00:08:03 +0400
Subject: [PATCH] Workaround for 'variable set but not used' issue

Signed-off-by: Fedora Ninjas <pjo...@fedoraproject.org>
---
 grub-core/lib/relocator.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
index dbd5fe4..606b545 100644
--- a/grub-core/lib/relocator.c
+++ b/grub-core/lib/relocator.c
@@ -1010,6 +1010,9 @@ malloc_in_range (struct grub_relocator *rel,
                      = ALIGN_UP (alloc_end,
                                  GRUB_RELOCATOR_FIRMWARE_REQUESTS_QUANT);
 
+                     grub_dprintf ("relocator", "requesting %lx-%lx\n",
+                                   (unsigned long) fstart,
+                                   (unsigned long) fend);
 #if GRUB_RELOCATOR_HAVE_LEFTOVERS
                    {
                      struct grub_relocator_fw_leftover *lo1 = NULL;
-- 
1.7.5.1

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to