diff options
author | Philip Tricca <flihp@twobit.us> | 2014-04-16 01:16:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-29 13:42:18 +0100 |
commit | f0a153a7f635ddd63ce1eb1b557bc3589d47fd21 (patch) | |
tree | 4898801e84bb2e2b4a48b6181d4b3cc83b3c50b6 /meta | |
parent | f2103de7855792ae6da84599e1db12f677a05eb1 (diff) | |
download | poky-f0a153a7f635ddd63ce1eb1b557bc3589d47fd21.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)
(From OE-Core rev: 63ce29a48b608f34dd378285a54c24ee83a3a1c7)
Signed-off-by: Philip Tricca <flihp@twobit.us>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-bsp/grub/grub-efi_2.00.bb | 4 |
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 | ||
73 | GRUB_BUILDIN ?= "boot linux ext2 fat serial part_msdos part_gpt normal efi_gop iso9660 search" | ||
74 | |||
73 | do_deploy() { | 75 | do_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 | ||