From cd29ff3927a6deae5e808525bd56acf7b4b0b60c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 13 Jan 2014 13:54:28 +0100 Subject: 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 Signed-off-by: Saul Wold --- meta/recipes-bsp/grub/grub_git.bb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'meta/recipes-bsp/grub/grub_git.bb') 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. -- cgit 1.2.3-korg