summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-12-16 06:12:30 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-16 16:05:35 (GMT)
commit02e01e614b9e807e8452351a40b795f0ae64ccba (patch)
treeec05c2379f97fb65872af8db7ae09fe0ea247eb8 /meta/recipes-bsp
parent9619f26c92a060735bb3d9b69b8cc26707c1fcda (diff)
downloadpoky-02e01e614b9e807e8452351a40b795f0ae64ccba.tar.gz
grub-efi: specify prefix so it can find grub.cfg
Specify /EFI/BOOT as the grub prefix so the grub efi payload can find the grub.cfg in the same directory. Ultimately, it might make more sense to install the grub tools and the grub-core modules to sysroot and make the grub-efi bbclass generate the image in the required format as part of the bootimg generation. However, bootimg is currently the only user, so make the correction here to resolve the immediate issue. (From OE-Core rev: bc046c58c8f3c462972e9004dda2612b58376492) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/grub/grub-efi-native_1.99.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
index c86cf50..9183812 100644
--- a/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
+++ b/meta/recipes-bsp/grub/grub-efi-native_1.99.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
16# FIXME: We should be able to optionally drop freetype as a dependency 16# FIXME: We should be able to optionally drop freetype as a dependency
17DEPENDS = "help2man-native" 17DEPENDS = "help2man-native"
18RDEPENDS_${PN} = "diffutils freetype" 18RDEPENDS_${PN} = "diffutils freetype"
19PR = "r1" 19PR = "r2"
20 20
21# Native packages do not normally rebuild when the target changes. 21# Native packages do not normally rebuild when the target changes.
22# Ensure this is built once per HOST-TARGET pair. 22# Ensure this is built once per HOST-TARGET pair.
@@ -58,7 +58,7 @@ EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \
58 --target=${GRUB_TARGET} --enable-efiemu=no --program-prefix=''" 58 --target=${GRUB_TARGET} --enable-efiemu=no --program-prefix=''"
59 59
60do_mkimage() { 60do_mkimage() {
61 ./grub-mkimage -p / -d ./grub-core/ \ 61 ./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \
62 -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ 62 -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \
63 boot linux fat serial part_msdos normal efi_gop 63 boot linux fat serial part_msdos normal efi_gop
64} 64}