diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-04-28 08:38:02 +0200 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2010-05-03 13:17:45 +0200 |
| commit | 345e0dbceb9dfdad489f866fb7ce1a244d4d48a9 (patch) | |
| tree | d3a16915b5d4be2480f2a82f523fed72babe5a02 /patches/grub-0.97 | |
| parent | 1256d2072564a356cd80f7484a7295f437273b89 (diff) | |
| download | ptxdist-345e0dbceb9dfdad489f866fb7ce1a244d4d48a9.tar.gz ptxdist-345e0dbceb9dfdad489f866fb7ce1a244d4d48a9.tar.xz | |
[grub] patch cleanup
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'patches/grub-0.97')
| -rw-r--r-- | patches/grub-0.97/grub-0.97-gcc4x.diff | 24 | ||||
| -rw-r--r-- | patches/grub-0.97/grub-set-install_partition_hd0_0.diff | 18 |
2 files changed, 15 insertions, 27 deletions
diff --git a/patches/grub-0.97/grub-0.97-gcc4x.diff b/patches/grub-0.97/grub-0.97-gcc4x.diff index 2be385ae9..b2509b141 100644 --- a/patches/grub-0.97/grub-0.97-gcc4x.diff +++ b/patches/grub-0.97/grub-0.97-gcc4x.diff @@ -1,21 +1,11 @@ -# -# Submitted-By: Benedikt Spranger, 2005-09-26 -# Committed-By: Robert Schwebel -# -# Error: -# -# -# -# Description: -# -# GCC 4.x declares non-static declaration and static definition and vice -# versa as error. -# -# State: -# -# unknown -# +Subject: fix static declaration +From: Benedikt Spranger <b.spranger@pengutronix.de> +GCC 4.x declares non-static declaration and static definition and vice +versa as error. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> +--- diff -ruN grub-0.97.orig/netboot/main.c grub-0.97/netboot/main.c --- grub-0.97.orig/netboot/main.c 2004-05-21 00:19:33.000000000 +0200 +++ grub-0.97/netboot/main.c 2005-09-15 17:33:34.383904479 +0200 diff --git a/patches/grub-0.97/grub-set-install_partition_hd0_0.diff b/patches/grub-0.97/grub-set-install_partition_hd0_0.diff index 763582885..acadba367 100644 --- a/patches/grub-0.97/grub-set-install_partition_hd0_0.diff +++ b/patches/grub-0.97/grub-set-install_partition_hd0_0.diff @@ -1,14 +1,12 @@ -# -# Submitted-By: Sascha Hauer, 2006-11-22 -# Committed-By: Sascha Hauer <s.hauer@pengutronix.de> -# -# Description: -# -# Let grub find the default partition the rootfs is installed -# on. There must be a better (proper) way to archieve this, -# but I don't know any. -# +From: Sascha Hauer <s.hauer@pengutronix.de> +Subject: Add hack for default partition +Let grub find the default partition the rootfs is installed +on. There must be a better (proper) way to archieve this, +but I don't know any. + +Signed-off-by: (not for upstream) +--- Index: grub-0.97/stage2/asm.S =================================================================== --- grub-0.97.orig/stage2/asm.S |