Adjusted paths in patch (it previously required option -p1).

This commit is contained in:
Grégoire Sutre 2009-12-27 19:31:52 +00:00 committed by Thomas Klausner
parent 8999fe9a35
commit 8205681591
2 changed files with 11 additions and 11 deletions

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.3 2009/12/27 19:17:10 gregoire Exp $
$NetBSD: distinfo,v 1.4 2009/12/27 19:31:52 gregoire Exp $
SHA1 (patch-__enable_execute_stack) = 7fde8c41c0cbd2f718bc4cab219b8e5dc1e99c4f
SHA1 (patch-aa) = a864ac2b3850603392bc9ea52746045dd263da15
SHA1 (patch-ab) = b8af0f7ee12ac44a6246786b2239efd21fd2e63a
SHA1 (patch-ac) = c7f76b4b87f0ac623daa0b344f67de1f800751d5
SHA1 (patch-ad) = b3d2cc4da0ab6874b674651443b27fc155264c9d
SHA1 (patch-grub-probe-netbsd) = b2ab3b7855641abe616efda781e9011a29bcb04b
SHA1 (patch-grub-probe-netbsd) = 78cd4b5e2143eb9aaa275b18e850ca921dd7ebe9

View file

@ -1,6 +1,6 @@
diff -Naurp grub2_2009-12-27/util/getroot.c grub2/util/getroot.c
--- grub2_2009-12-27/util/getroot.c 2009-12-27 16:04:32.000000000 +0100
+++ grub2/util/getroot.c 2009-12-27 17:51:46.000000000 +0100
diff -Naurp util/getroot.c.orig util/getroot.c
--- util/getroot.c.orig 2009-12-27 16:04:32.000000000 +0100
+++ util/getroot.c
@@ -266,8 +266,14 @@ find_root_device (const char *dir, dev_t
char *cwd;
@ -16,9 +16,9 @@ diff -Naurp grub2_2009-12-27/util/getroot.c grub2/util/getroot.c
strip_extra_slashes (res);
free (cwd);
diff -Naurp grub2_2009-12-27/util/grub-probe.c grub2/util/grub-probe.c
--- grub2_2009-12-27/util/grub-probe.c 2009-12-27 16:04:32.000000000 +0100
+++ grub2/util/grub-probe.c 2009-12-27 17:49:02.000000000 +0100
diff -Naurp util/grub-probe.c.orig util/grub-probe.c
--- util/grub-probe.c.orig 2009-12-27 16:04:32.000000000 +0100
+++ util/grub-probe.c
@@ -111,7 +111,7 @@ probe (const char *path, char *device_na
if (path == NULL)
@ -28,9 +28,9 @@ diff -Naurp grub2_2009-12-27/util/grub-probe.c grub2/util/grub-probe.c
if (! grub_util_check_char_device (device_name))
grub_util_error ("%s is not a character device.\n", device_name);
#else
diff -Naurp grub2_2009-12-27/util/hostdisk.c grub2/util/hostdisk.c
--- grub2_2009-12-27/util/hostdisk.c 2009-12-27 16:04:32.000000000 +0100
+++ grub2/util/hostdisk.c 2009-12-27 18:21:15.000000000 +0100
diff -Naurp util/hostdisk.c.orig util/hostdisk.c
--- util/hostdisk.c.orig 2009-12-27 16:04:32.000000000 +0100
+++ util/hostdisk.c
@@ -97,6 +97,12 @@ struct hd_geometry
# include <sys/disk.h>
#endif