diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-04-02 01:55:16 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-13 22:28:32 +0100 |
| commit | a7fca64d04949e76805e7acc3f617a1cd4a107a7 (patch) | |
| tree | e1cdb085e70ae156a7d4d26a78cf69e7cd77b740 /meta/recipes-bsp/grub | |
| parent | e4cbbfb167e22211abf41b90b71cab2fe5b330da (diff) | |
| download | openembedded-core-a7fca64d04949e76805e7acc3f617a1cd4a107a7.tar.gz openembedded-core-a7fca64d04949e76805e7acc3f617a1cd4a107a7.tar.bz2 openembedded-core-a7fca64d04949e76805e7acc3f617a1cd4a107a7.zip | |
grub-efi: add PACKAGECONFIG for grub-mount and device-mapper
We had PACKAGECONFIGs for grub_2.00 and grub_git, we also need them for
grub-efi, otherwise there might be failures as:
grub-2.00/util/grub-mount.c:37:23: fatal error: fuse/fuse.h: No such file or directory
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub')
| -rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub_2.00.bb | 4 | ||||
| -rw-r--r-- | meta/recipes-bsp/grub/grub_git.bb | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 39469576cc..4d9e3c7287 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc @@ -35,6 +35,10 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)' inherit autotools gettext texinfo +PACKAGECONFIG ??= "" +PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" +PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" + # grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are # conflicted, remove it since no one uses it. SYSROOT_PREPROCESS_FUNCS_class-target += "remove_sysroot_mkconfig_lib" diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb index a11e960fe5..88a709edb6 100644 --- a/meta/recipes-bsp/grub/grub_2.00.bb +++ b/meta/recipes-bsp/grub/grub_2.00.bb @@ -6,10 +6,6 @@ PR = "r1" FILES_${PN}-dbg += "${libdir}/${BPN}/i386-pc/.debug" -PACKAGECONFIG ??= "" -PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" -PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" - EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \ --enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no" diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb index 3ab675b298..c2760c9ace 100644 --- a/meta/recipes-bsp/grub/grub_git.bb +++ b/meta/recipes-bsp/grub/grub_git.bb @@ -20,10 +20,6 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' inherit autotools gettext texinfo -PACKAGECONFIG ??= "" -PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" -PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" - # configure.ac has code to set this automagically from the target tuple # but the OE freeform one (core2-foo-bar-linux) don't work with that. |