diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-03 18:38:19 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:08:19 +0000 |
commit | ac867c3d4d1991e2e4f83cca2bad0ee31716796e (patch) | |
tree | fbcd2a23598423e58061623e058d602d000c0a75 /meta/recipes-bsp/grub/files/grub-install.in.patch | |
parent | 175d162b19b65a329163b0510d915ffae71af4de (diff) | |
download | poky-ac867c3d4d1991e2e4f83cca2bad0ee31716796e.tar.gz |
grub 2.0: several fixes
* Make grub, grub-efi grub_git use a grub2.inc to reduce the duplicated code.
* Make grub and grub-efi use the same patches since they use the same
source. (grub_git is different).
* grub-efi:
- Use autotools to replace autotools-brokensep
- Remove the DEPENDS of freetype, it should be a RDEPENDS.
- Remove grub-2.00-ignore-gnulib-gets-stupidity.patch since it is a
duplication of remove-gets.patch.
- Make grub-efi.rpm contain files rather than make an empty package.
* grub_git:
- Fix a SSE build failure.
[YOCTO #6310]
(From OE-Core rev: cf4aaed28a34cc652352f0817316187b72babc76)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/files/grub-install.in.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/grub-install.in.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-install.in.patch b/meta/recipes-bsp/grub/files/grub-install.in.patch new file mode 100644 index 0000000000..326951df44 --- /dev/null +++ b/meta/recipes-bsp/grub/files/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 | ||