mirror of
https://git.yoctoproject.org/poky
synced 2026-02-10 10:43:02 +01:00
ac867c3d4d
* 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>
21 lines
899 B
Diff
21 lines
899 B
Diff
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
|