mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

grub2.inc: dont export TARGET_CFLAGS etc to grub2 configure

Browse Source 
The grub2 configure script uses variables such as TARGET_CFLAGS etc
for its own purposes. Remove the OE versions from the configure
environment to avoid conflicts.

(From OE-Core rev: 58a79e6bf7d8c6ec03581f14fb83da0eeb526cc6)

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andre McCurdy
2016-02-26 21:53:04 -08:00
committed by Richard Purdie
parent 97a3322229
commit 576587dae0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-bsp/grub/grub2.inc
+7 -1
View File
@@ -44,10 +44,16 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse" PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse"
PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2" PACKAGECONFIG[device-mapper] = "--enable-device-mapper,--disable-device-mapper,lvm2"
do_configure_prepend() {
# The grub2 configure script uses variables such as TARGET_CFLAGS etc
# for its own purposes. Remove the OE versions from the environment to
# avoid conflicts.
unset TARGET_CPPFLAGS TARGET_CFLAGS TARGET_CXXFLAGS TARGET_LDFLAGS
}
# 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"
remove_sysroot_mkconfig_lib() { remove_sysroot_mkconfig_lib() {
rm -r "${SYSROOT_DESTDIR}${datadir}/grub/grub-mkconfig_lib" rm -r "${SYSROOT_DESTDIR}${datadir}/grub/grub-mkconfig_lib"
} }