diff options
| author | Koen Kooi <koen.kooi@linaro.org> | 2014-01-13 13:54:28 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-14 11:33:55 +0000 |
| commit | d4ad8f7119cceff3e7088227e19e80e3485ec2ff (patch) | |
| tree | c0c1409775cf8e2a0db61365344b9f9719134f02 /meta/recipes-bsp/grub/grub_git.bb | |
| parent | 90e8429de68ca288e9a6554e7d6e8ac1473334e7 (diff) | |
| download | poky-d4ad8f7119cceff3e7088227e19e80e3485ec2ff.tar.gz | |
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'
(From OE-Core rev: cd29ff3927a6deae5e808525bd56acf7b4b0b60c)
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/grub_git.bb')
| -rw-r--r-- | meta/recipes-bsp/grub/grub_git.bb | 5 |
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" | |||
| 17 | DEFAULT_PREFERENCE_arm = "1" | 17 | DEFAULT_PREFERENCE_arm = "1" |
| 18 | 18 | ||
| 19 | PV = "2.00+${SRCPV}" | 19 | PV = "2.00+${SRCPV}" |
| 20 | SRCREV = "3bc1b2daabb9b07a9c08bca386005d96f07147fe" | 20 | SRCREV = "0776112c5311196889a15058a3b1be4c81ba5e05" |
| 21 | SRC_URI = "git://git.savannah.gnu.org/grub.git \ | 21 | SRC_URI = "git://git.savannah.gnu.org/grub.git \ |
| 22 | file://0001-fdt-add-grub_fdt_create_empty_tree-function.patch \ | ||
| 23 | file://0002-arm64-add-EFI-Linux-loader.patch \ | ||
| 24 | file://40_custom \ | 22 | file://40_custom \ |
| 25 | " | 23 | " |
| 26 | 24 | ||
| @@ -33,6 +31,7 @@ inherit gettext | |||
| 33 | 31 | ||
| 34 | PACKAGECONFIG ??= "" | 32 | PACKAGECONFIG ??= "" |
| 35 | PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" | 33 | PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" |
| 34 | PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" | ||
| 36 | 35 | ||
| 37 | # configure.ac has code to set this automagically from the target tuple | 36 | # configure.ac has code to set this automagically from the target tuple |
| 38 | # but the OE freeform one (core2-foo-bar-linux) don't work with that. | 37 | # but the OE freeform one (core2-foo-bar-linux) don't work with that. |