Skip to contentSkip to conversation

grub: bump to 0.97-67

PATCH New Thomas Petazzoni 2 participants 3 messages Dec 4, 2013 – Jan 7, 2014

lore
Share & tools
lore

Thomas Petazzoni

author
#0 lore raw

PATCH 1/1 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 Thomas Petazzoni <[email protected]>
---
 boot/grub/grub.200-fix_mbr_handling.patch     |   10 +-
 boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch |   14 +-
 boot/grub/grub.400-nic_update2.patch          | 3332 ++++---------------------
 boot/grub/grub.mk                             |    6 +-
 4 files changed, 475 insertions(+), 2887 deletions(-)
boot/grub/grub.200-fix_mbr_handling.patch +6 -4
index fdee0ef..21e200f 100644
@@ -1,8 +1,10 @@
---- 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
index 5b94186..8ed9d76 100644
@@ -1,6 +1,7 @@
-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

2,963 lines not on this page · raw message

boot/grub/grub.mk +3 -3
index eb066af..7653e5b 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.8.1.2

Part of the diff is not shown here. View the raw message.

author
#1 lore raw

PATCH 1/1 grub: bump to 0.97-67

Hello,

Quoted 5 lines · Thomas Petazzoni

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.

Quoted 7 lines
Signed-off-by Thomas Petazzoni <[email protected]>
---
 boot/grub/grub.200-fix_mbr_handling.patch     |   10 +-
 boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch |   14 +-
 boot/grub/grub.400-nic_update2.patch          | 3332 ++++---------------------
 boot/grub/grub.mk                             |    6 +-
 4 files changed, 475 insertions(+), 2887 deletions(-)

Any reason why this patch was never applied? Interestingly, I don't see it anymore in patchwork, but it wasn't applied either.

Could it be applied?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 grub: bump to 0.97-67

Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 5 lines · Thomas Petazzoni

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.

Quoted 7 lines
Signed-off-by Thomas Petazzoni <[email protected]>

---

boot/grub/grub.200-fix_mbr_handling.patch     |   10 +-
boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch |   14 +-
boot/grub/grub.400-nic_update2.patch          | 3332 ++++---------------------
boot/grub/grub.mk                             |    6 +-
4 files changed, 475 insertions(+), 2887 deletions(-)
Quoted 2 lines

Any reason why this patch was never applied? Interestingly, I don't see it anymore in patchwork, but it wasn't applied either.

Odd, it must somehow have fallen between the crack ..

Quoted 1 line

Could it be applied?

Sure, done - Thanks.

Signature · 1 line
Bye, Peter Korsgaard