aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub/grub_git.bb
diff options
context:
space:
mode:
authorKoen Kooi <koen.kooi@linaro.org>2014-01-13 13:54:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-14 11:33:18 +0000
commitcd29ff3927a6deae5e808525bd56acf7b4b0b60c (patch)
tree0eefd9962ccd8b6fe089379b7e5bfbc8f98c69f3 /meta/recipes-bsp/grub/grub_git.bb
parent7c3b070b9cdd8b1d564d8900858cd31d11b20e6f (diff)
downloadopenembedded-core-contrib-cd29ff3927a6deae5e808525bd56acf7b4b0b60c.tar.gz
openembedded-core-contrib-cd29ff3927a6deae5e808525bd56acf7b4b0b60c.tar.bz2
openembedded-core-contrib-cd29ff3927a6deae5e808525bd56acf7b4b0b60c.zip
grub git: update to latest git
Drop the 2 patches since the functionality is upstream now. Also sync PACKAGECONFIG with grub 2.00 recipe. The debugedit problem for 64 bit machines in do_package is still present, though: ERROR: debugedit failed with exit code 256 (cmd was '/build/linaro/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit' -b '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux' -d '/usr/src/debug' -i -l '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/debugsources.list' '/build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/package/usr/lib/grub/arm64-efi/cpio_be.module'): /build/linaro/build/build/tmp-eglibc/sysroots/x86_64-linux/usr/lib/rpm/bin/debugedit: /build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/package/usr/lib/grub/arm64-efi/cpio_be.module: Unhandled relocation 258 in .debug_info section ERROR: Function failed: split_and_strip_files ERROR: Logfile of failure stored in: /build/linaro/build/build/tmp-eglibc/work/aarch64-oe-linux/grub/2.00+AUTOINC+0776112c53-r0/temp/log.do_package.29234 ERROR: Task 10 (/build/linaro/build/openembedded-core/meta/recipes-bsp/grub/grub_git.bb, do_package) failed with exit code '1' Signed-off-by: Koen Kooi <koen.kooi@linaro.org> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-bsp/grub/grub_git.bb')
-rw-r--r--meta/recipes-bsp/grub/grub_git.bb5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb
index ca636f32ce..1796e7f660 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/meta/recipes-bsp/grub/grub_git.bb
@@ -17,10 +17,8 @@ DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_arm = "1"
PV = "2.00+${SRCPV}"
-SRCREV = "3bc1b2daabb9b07a9c08bca386005d96f07147fe"
+SRCREV = "0776112c5311196889a15058a3b1be4c81ba5e05"
SRC_URI = "git://git.savannah.gnu.org/grub.git \
- file://0001-fdt-add-grub_fdt_create_empty_tree-function.patch \
- file://0002-arm64-add-EFI-Linux-loader.patch \
file://40_custom \
"
@@ -33,6 +31,7 @@ inherit gettext
PACKAGECONFIG ??= ""
PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse"
+PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2"
# configure.ac has code to set this automagically from the target tuple
# but the OE freeform one (core2-foo-bar-linux) don't work with that.