diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-09-14 13:44:29 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-15 11:23:58 +0100 |
commit | 7b6b3b86551fe2f6073b72b0a03d08192ca33e1d (patch) | |
tree | 0392a7fee72483bc7986042333684e857ba8064c /meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch | |
parent | bcd1bca88052bfab4aaca74608134f4c8ff797de (diff) | |
download | poky-7b6b3b86551fe2f6073b72b0a03d08192ca33e1d.tar.gz |
grub2: new recipe
This adds the grub-1.98 from meta-intel while upgrading it to 1.99.
(From OE-Core rev: ccd2148e686f93518dc1a80376f7ddb24587a3da)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch')
-rw-r--r-- | meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch | 20 |
1 files changed, 20 insertions, 0 deletions
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 new file mode 100644 index 0000000000..326951df44 --- /dev/null +++ b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch | |||
@@ -0,0 +1,20 @@ | |||
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 | ||