summaryrefslogtreecommitdiffstats
path: root/boot/grub/grub.200-fix_mbr_handling.patch
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-12-04 22:11:00 +0100
committerPeter Korsgaard <peter@korsgaard.com>2014-01-07 10:22:35 +0100
commita79ea8a60bd43f968e5235deffe6bff7ed140c94 (patch)
treed47ebf08c8584a2cfac4a6e99d0786dc57d085aa /boot/grub/grub.200-fix_mbr_handling.patch
parent4da14cd16bc0bd66443b2def7bc486dfc953d117 (diff)
downloadbuildroot-a79ea8a60bd43f968e5235deffe6bff7ed140c94.tar.gz
buildroot-a79ea8a60bd43f968e5235deffe6bff7ed140c94.zip
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 <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'boot/grub/grub.200-fix_mbr_handling.patch')
-rw-r--r--boot/grub/grub.200-fix_mbr_handling.patch10
1 files changed, 6 insertions, 4 deletions
diff --git a/boot/grub/grub.200-fix_mbr_handling.patch b/boot/grub/grub.200-fix_mbr_handling.patch
index fdee0ef877..21e200f172 100644
--- a/boot/grub/grub.200-fix_mbr_handling.patch
+++ b/boot/grub/grub.200-fix_mbr_handling.patch
@@ -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)
OpenPOWER on IntegriCloud