diff options
Diffstat (limited to 'meta/recipes-bsp/grub/grub-1.99')
-rwxr-xr-x | meta/recipes-bsp/grub/grub-1.99/40_custom | 9 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub-1.99/grub-1.99-lazy_stat.patch | 64 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch | 20 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub-1.99/remove-gets.patch | 20 |
4 files changed, 0 insertions, 113 deletions
diff --git a/meta/recipes-bsp/grub/grub-1.99/40_custom b/meta/recipes-bsp/grub/grub-1.99/40_custom deleted file mode 100755 index ba488308b6..0000000000 --- a/meta/recipes-bsp/grub/grub-1.99/40_custom +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | exec tail -n +3 $0 | ||
3 | # This file provides an easy way to add custom menu entries. Simply type the | ||
4 | # menu entries you want to add after this comment. Be careful not to change | ||
5 | # the 'exec tail' line above. | ||
6 | menuentry "Linux" { | ||
7 | set root=(hd0,1) | ||
8 | linux /boot/vmlinuz root=__ROOTFS__ rw __CONSOLE__ __VIDEO_MODE__ __VGA_MODE__ quiet | ||
9 | } | ||
diff --git a/meta/recipes-bsp/grub/grub-1.99/grub-1.99-lazy_stat.patch b/meta/recipes-bsp/grub/grub-1.99/grub-1.99-lazy_stat.patch deleted file mode 100644 index cde8b87a47..0000000000 --- a/meta/recipes-bsp/grub/grub-1.99/grub-1.99-lazy_stat.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Patch is a slightly edited version from debian. Upstream link is: | ||
4 | http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/3318 | ||
5 | |||
6 | Description: Don't stat devices unless we have to | ||
7 | Author: Vladimir Serbinenko <phcoder@gmail.com> | ||
8 | Author: Colin Watson <cjwatson@ubuntu.com> | ||
9 | Bug-Debian: http://bugs.debian.org/627587 | ||
10 | Forwarded: yes | ||
11 | Applied-Upstream: http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3318 | ||
12 | Last-Update: 2011-05-31 | ||
13 | |||
14 | Index: b/grub-core/kern/emu/getroot.c | ||
15 | =================================================================== | ||
16 | --- a/grub-core/kern/emu/getroot.c | ||
17 | +++ b/grub-core/kern/emu/getroot.c | ||
18 | @@ -358,7 +358,7 @@ | ||
19 | |||
20 | if (S_ISLNK (st.st_mode)) { | ||
21 | #ifdef __linux__ | ||
22 | - if (strcmp (dir, "mapper") == 0) { | ||
23 | + if (strcmp (dir, "mapper") == 0 || strcmp (dir, "/dev/mapper") == 0) { | ||
24 | /* Follow symbolic links under /dev/mapper/; the canonical name | ||
25 | may be something like /dev/dm-0, but the names under | ||
26 | /dev/mapper/ are more human-readable and so we prefer them if | ||
27 | @@ -609,20 +609,27 @@ | ||
28 | |||
29 | if (os_dev) | ||
30 | { | ||
31 | - if (stat (os_dev, &st) >= 0) | ||
32 | - dev = st.st_rdev; | ||
33 | - else | ||
34 | - grub_util_error ("cannot stat `%s'", os_dev); | ||
35 | - free (os_dev); | ||
36 | + char *tmp = os_dev; | ||
37 | + os_dev = canonicalize_file_name (os_dev); | ||
38 | + free (tmp); | ||
39 | } | ||
40 | - else | ||
41 | + | ||
42 | + if (os_dev) | ||
43 | { | ||
44 | - if (stat (dir, &st) >= 0) | ||
45 | - dev = st.st_dev; | ||
46 | - else | ||
47 | - grub_util_error ("cannot stat `%s'", dir); | ||
48 | + if (strncmp (os_dev, "/dev/dm-", sizeof ("/dev/dm-") - 1) != 0) | ||
49 | + return os_dev; | ||
50 | + if (stat (os_dev, &st) < 0) | ||
51 | + grub_util_error ("cannot stat `%s'", os_dev); | ||
52 | + free (os_dev); | ||
53 | + dev = st.st_rdev; | ||
54 | + return grub_find_device ("/dev/mapper", dev); | ||
55 | } | ||
56 | |||
57 | + if (stat (dir, &st) < 0) | ||
58 | + grub_util_error ("cannot stat `%s'", dir); | ||
59 | + | ||
60 | + dev = st.st_dev; | ||
61 | + | ||
62 | #ifdef __CYGWIN__ | ||
63 | /* Cygwin specific function. */ | ||
64 | os_dev = grub_find_device (dir, dev); | ||
diff --git a/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch deleted file mode 100644 index 326951df44..0000000000 --- a/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Our use of grub-install doesn't require the -x option, so we should be | ||
4 | be able make use of grep versions that don't support it. | ||
5 | |||
6 | Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> | ||
7 | |||
8 | Index: grub-1.99/util/grub-install.in | ||
9 | =================================================================== | ||
10 | --- grub-1.99.orig/util/grub-install.in 2011-09-09 22:37:20.093906679 -0500 | ||
11 | +++ grub-1.99/util/grub-install.in 2011-09-09 22:37:30.854737882 -0500 | ||
12 | @@ -510,7 +510,7 @@ | ||
13 | |||
14 | if [ "x${devabstraction_module}" = "x" ] ; then | ||
15 | if [ x"${install_device}" != x ]; then | ||
16 | - if echo "${install_device}" | grep -qx "(.*)" ; then | ||
17 | + if echo "${install_device}" | grep -q "(.*)" ; then | ||
18 | install_drive="${install_device}" | ||
19 | else | ||
20 | install_drive="`"$grub_probe" --device-map="${device_map}" --target=drive --device "${install_device}"`" || exit 1 | ||
diff --git a/meta/recipes-bsp/grub/grub-1.99/remove-gets.patch b/meta/recipes-bsp/grub/grub-1.99/remove-gets.patch deleted file mode 100644 index 463f7847ad..0000000000 --- a/meta/recipes-bsp/grub/grub-1.99/remove-gets.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Index: grub-1.99/grub-core/gnulib/stdio.in.h | ||
7 | =================================================================== | ||
8 | --- grub-1.99.orig/grub-core/gnulib/stdio.in.h 2010-12-01 06:45:43.000000000 -0800 | ||
9 | +++ grub-1.99/grub-core/gnulib/stdio.in.h 2012-07-04 12:25:02.057099107 -0700 | ||
10 | @@ -140,8 +140,10 @@ | ||
11 | /* It is very rare that the developer ever has full control of stdin, | ||
12 | so any use of gets warrants an unconditional warning. Assume it is | ||
13 | always declared, since it is required by C89. */ | ||
14 | +#if defined gets | ||
15 | #undef gets | ||
16 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
17 | +#endif | ||
18 | |||
19 | #if @GNULIB_FOPEN@ | ||
20 | # if @REPLACE_FOPEN@ | ||