summaryrefslogtreecommitdiff
path: root/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-09-14 13:44:29 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-15 11:21:44 +0100
commitccd2148e686f93518dc1a80376f7ddb24587a3da (patch)
tree312fef935498f949517e10aef4278945ff7c0099 /meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
parentc67d03eb3684acab89e5972609e397087727e74e (diff)
downloadopenembedded-core-ccd2148e686f93518dc1a80376f7ddb24587a3da.tar.gz
openembedded-core-ccd2148e686f93518dc1a80376f7ddb24587a3da.tar.bz2
openembedded-core-ccd2148e686f93518dc1a80376f7ddb24587a3da.tar.xz
openembedded-core-ccd2148e686f93518dc1a80376f7ddb24587a3da.zip
grub2: new recipe
This adds the grub-1.98 from meta-intel while upgrading it to 1.99. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
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.patch20
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 000000000..326951df4
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Our use of grub-install doesn't require the -x option, so we should be
+be able make use of grep versions that don't support it.
+
+Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
+
+Index: grub-1.99/util/grub-install.in
+===================================================================
+--- grub-1.99.orig/util/grub-install.in 2011-09-09 22:37:20.093906679 -0500
++++ grub-1.99/util/grub-install.in 2011-09-09 22:37:30.854737882 -0500
+@@ -510,7 +510,7 @@
+
+ if [ "x${devabstraction_module}" = "x" ] ; then
+ if [ x"${install_device}" != x ]; then
+- if echo "${install_device}" | grep -qx "(.*)" ; then
++ if echo "${install_device}" | grep -q "(.*)" ; then
+ install_drive="${install_device}"
+ else
+ install_drive="`"$grub_probe" --device-map="${device_map}" --target=drive --device "${install_device}"`" || exit 1