Patchwork [3/4] grub-efi: specify prefix so it can find grub.cfg

login
register
mail settings
Submitter Darren Hart
Date Dec. 16, 2011, 6:12 a.m.
Message ID <61487032f52e7451da5c15ec96f7989c62c251b2.1324015417.git.dvhart@linux.intel.com>
Download mbox | patch
Permalink /patch/17085/
State Accepted
Commit bc046c58c8f3c462972e9004dda2612b58376492
Headers show

Comments

Darren Hart - Dec. 16, 2011, 6:12 a.m.
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.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta/recipes-bsp/grub/grub-efi-native_1.99.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

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"
 # FIXME: We should be able to optionally drop freetype as a dependency
 DEPENDS = "help2man-native"
 RDEPENDS_${PN} = "diffutils freetype"
-PR = "r1"
+PR = "r2"
 
 # Native packages do not normally rebuild when the target changes.
 # Ensure this is built once per HOST-TARGET pair.
@@ -58,7 +58,7 @@  EXTRA_OECONF = "--with-platform=efi --disable-grub-mkfont \
                 --target=${GRUB_TARGET} --enable-efiemu=no --program-prefix=''"
 
 do_mkimage() {
-	./grub-mkimage -p / -d ./grub-core/ \
+	./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \
 		       -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \
 	               boot linux fat serial part_msdos normal efi_gop
 }