mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
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 (From OE-Core rev: a7fca64d04949e76805e7acc3f617a1cd4a107a7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
9ee62f1da3
commit
5fd4453d82
@@ -35,6 +35,10 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*)-(linux|freebsd.*)'
|
|||||||
|
|
||||||
inherit autotools gettext texinfo
|
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
|
# grub and grub-efi's sysroot/${datadir}/grub/grub-mkconfig_lib are
|
||||||
# conflicted, remove it since no one uses it.
|
# conflicted, remove it since no one uses it.
|
||||||
SYSROOT_PREPROCESS_FUNCS_class-target += "remove_sysroot_mkconfig_lib"
|
SYSROOT_PREPROCESS_FUNCS_class-target += "remove_sysroot_mkconfig_lib"
|
||||||
|
|||||||
@@ -6,10 +6,6 @@ PR = "r1"
|
|||||||
FILES_${PN}-dbg += "${libdir}/${BPN}/i386-pc/.debug"
|
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="" \
|
EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --program-prefix="" \
|
||||||
--enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no"
|
--enable-liblzma=no --enable-device-mapper=no --enable-libzfs=no"
|
||||||
|
|
||||||
|
|||||||
@@ -20,10 +20,6 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)'
|
|||||||
|
|
||||||
inherit autotools gettext texinfo
|
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
|
# 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.
|
# but the OE freeform one (core2-foo-bar-linux) don't work with that.
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user