summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Tricca <flihp@twobit.us>2014-04-16 01:16:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-23 11:43:27 +0100
commit92bd019177b5579f86f799cf4344c251b536e12c (patch)
treef6e203893e64b25e284124aa9833e033da0265f0
parent920bfc33444f2bd6ebf30f462fa41610c5e68545 (diff)
downloadpoky-92bd019177b5579f86f799cf4344c251b536e12c.tar.gz
grub-efi: Use a variable to specify built-in grub modules.
The previous behavior defines a static set of modules that are built into the grub efi executable. This works fine for a limited set of boot environments namely the standard linux/initrd. This patch conditionally assigns the same modules to a variable. This allows other meta layers to add additional modules or completely override the defaults. The use case driving this patch is the use of multiboot2 and related modules. (From OE-Core rev: 597f8e0040ba3135220000b23767858c64b5c9b8) Signed-off-by: Philip Tricca <flihp@twobit.us> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/grub/grub-efi_2.00.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb
index 6944cb280e..4b43749200 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb
@@ -70,12 +70,14 @@ do_install_class-native() {
70 install -m 755 grub-mkimage ${D}${bindir} 70 install -m 755 grub-mkimage ${D}${bindir}
71} 71}
72 72
73GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal efi_gop iso9660 search"
74
73do_deploy() { 75do_deploy() {
74 # Search for the grub.cfg on the local boot media by using the 76 # Search for the grub.cfg on the local boot media by using the
75 # built in cfg file provided via this recipe 77 # built in cfg file provided via this recipe
76 grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \ 78 grub-mkimage -c ../cfg -p /EFI/BOOT -d ./grub-core/ \
77 -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \ 79 -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \
78 boot linux ext2 fat serial part_msdos part_gpt normal efi_gop iso9660 search 80 ${GRUB_BUILDIN}
79 install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR} 81 install -m 644 ${B}/${GRUB_IMAGE} ${DEPLOYDIR}
80} 82}
81 83