diff options
| author | root <root@arianrhod.panaceas.james.local> | 2012-11-16 12:07:02 +0000 |
|---|---|---|
| committer | root <root@arianrhod.panaceas.james.local> | 2012-11-16 12:07:02 +0000 |
| commit | 90bfd94a67b0b5458afdcee4c78fce7d44981dd8 (patch) | |
| tree | 88463475e57c0f5cdc959720b95353f9808cab2e | |
| parent | eab0f7894030a3d5529e63ccffe96aca6b0b95ad (diff) | |
| download | grub-1.99-pq-90bfd94a67b0b5458afdcee4c78fce7d44981dd8.tar.gz grub-1.99-pq-90bfd94a67b0b5458afdcee4c78fce7d44981dd8.tar.bz2 grub-1.99-pq-90bfd94a67b0b5458afdcee4c78fce7d44981dd8.zip | |
debian fixes
| -rw-r--r-- | master/debian/lzo.patch | 2 | ||||
| -rw-r--r-- | master/debian/userland-part.patch | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/master/debian/lzo.patch b/master/debian/lzo.patch index 08be339..a80c141 100644 --- a/master/debian/lzo.patch +++ b/master/debian/lzo.patch @@ -8500,7 +8500,7 @@ Index: b/grub-core/lib/minilzo/minilzo.h + Index: b/grub-core/lib/posix_wrap/limits.h =================================================================== ---- /dev/null +--- a/grub-core/lib/posix_wrap/limits.h +++ b/grub-core/lib/posix_wrap/limits.h @@ -0,0 +1,31 @@ +/* diff --git a/master/debian/userland-part.patch b/master/debian/userland-part.patch index 16d2156..6502885 100644 --- a/master/debian/userland-part.patch +++ b/master/debian/userland-part.patch @@ -5,9 +5,11 @@ Forwarded: not-needed Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/4290 Last-Update: 2012-06-08 ---- a/grub-core/kern/emu/getroot.c 2012-05-03 20:59:16 +0000 -+++ b/grub-core/kern/emu/getroot.c 2012-05-03 21:41:46 +0000 -@@ -337,6 +337,75 @@ +diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c +index 7970e35..fe62c6e 100644 +--- a/grub-core/kern/emu/getroot.c ++++ b/grub-core/kern/emu/getroot.c +@@ -337,6 +337,75 @@ grub_find_device (const char *dir __attribute__ ((unused)), #elif defined (__GNU__) @@ -83,7 +85,7 @@ Last-Update: 2012-06-08 #elif ! defined(__CYGWIN__) char * -@@ -565,61 +634,8 @@ +@@ -565,61 +634,8 @@ grub_guess_root_device (const char *dir) { char *os_dev = NULL; #ifdef __GNU__ |