Commit a79ea8a6 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

grub: bump to 0.97-67 



Bump to a more recent version of the Debian patches for grub legacy,
that fix an incorrect build with gcc 4.6.

Fixes #6092 and #2629.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 4da14cd1

boot/grub/grub.200-fix_mbr_handling.patch

+6 −4
Original line number Diff line number Diff line 
--- grub-0.97.oorig/stage2/disk_io.c	2004-05-23 18:35:24.000000000 +0200

+++ grub-0.97/stage2/disk_io.c	2006-03-12 14:11:51.000000000 +0100

@@ -365,7 +365,7 @@ rawwrite (int drive, int sector, char *b

Index: b/stage2/disk_io.c

===================================================================

--- a/stage2/disk_io.c

+++ b/stage2/disk_io.c

@@ -365,7 +365,7 @@

 int

 devwrite (int sector, int sector_count, char *buf)

 devwrite (unsigned int sector, int sector_count, char *buf)

 {

-#if defined(GRUB_UTIL) && defined(__linux__)

+#if defined(GRUB_UTIL) && defined(__linux__) && !defined(SUPPORT_LOOPDEV)

boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch

+8 −6
Original line number Diff line number Diff line 
diff -rup grub-0.97.orig/grub/asmstub.c grub-0.97/grub/asmstub.c

--- grub-0.97.orig/grub/asmstub.c	2006-11-29 20:36:20.000000000 +0100

+++ grub-0.97/grub/asmstub.c	2006-11-29 21:26:16.000000000 +0100

Index: b/grub/asmstub.c

===================================================================

--- a/grub/asmstub.c

+++ b/grub/asmstub.c

@@ -18,10 +18,13 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */
@@ -15,9 +16,10 @@ diff -rup grub-0.97.orig/grub/asmstub.c grub-0.97/grub/asmstub.c 
 

 /* Simulator entry point. */

 int grub_stage2 (void);

diff -rup grub-0.97.orig/lib/device.c grub-0.97/lib/device.c

--- grub-0.97.orig/lib/device.c	2006-11-29 20:36:20.000000000 +0100

+++ grub-0.97/lib/device.c	2006-11-29 21:25:19.000000000 +0100

Index: b/lib/device.c

===================================================================

--- a/lib/device.c

+++ b/lib/device.c

@@ -18,10 +18,13 @@

  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

  */

boot/grub/grub.400-nic_update2.patch

+458 −2874

File changed.

Preview size limit exceeded, changes collapsed.

boot/grub/grub.mk

+3 −3
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 


GRUB_VERSION = 0.97

GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz

GRUB_PATCH  = grub_$(GRUB_VERSION)-35.diff.gz

GRUB_SITE   = http://snapshot.debian.org/archive/debian/20080329T000000Z/pool/main/g/grub/

GRUB_PATCH  = grub_$(GRUB_VERSION)-67.diff.gz

GRUB_SITE   = http://snapshot.debian.org/archive/debian/20130129T225227Z/pool/main/g/grub/



GRUB_LICENSE = GPLv2+

GRUB_LICENSE_FILES = COPYING
@@ -64,7 +64,7 @@ GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_XFS),xfs) 


define GRUB_DEBIAN_PATCHES

	# Apply the patches from the Debian patch

	(cd $(@D) ; for f in `cat debian/patches/00list | grep -v ^#` ; do \

	(cd $(@D) ; for f in `cat debian/patches/series | grep -v ^#` ; do \

		cat debian/patches/$$f | patch -g0 -p1 ; \

	done)

endef