summaryrefslogtreecommitdiff
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-02-26 21:53:04 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-02 22:39:05 +0000
commit58a79e6bf7d8c6ec03581f14fb83da0eeb526cc6 (patch)
tree8965e55ebc05dfa39d071d8a09c4d338fbf82915 /meta/recipes-bsp
parentbec8c8dc4d22d1a63c5f0ac1e2c2736c4e28ad80 (diff)
downloadopenembedded-core-58a79e6bf7d8c6ec03581f14fb83da0eeb526cc6.tar.gz
openembedded-core-58a79e6bf7d8c6ec03581f14fb83da0eeb526cc6.tar.bz2
openembedded-core-58a79e6bf7d8c6ec03581f14fb83da0eeb526cc6.zip
grub2.inc: dont export TARGET_CFLAGS etc to grub2 configure
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. Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/grub/grub2.inc8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc
index 84a47273a5..5a12563975 100644
--- a/meta/recipes-bsp/grub/grub2.inc
+++ b/meta/recipes-bsp/grub/grub2.inc
@@ -44,10 +44,16 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG[grub-mount] = "--enable-grub-mount,--disable-grub-mount,fuse"
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
# conflicted, remove it since no one uses it.
SYSROOT_PREPROCESS_FUNCS_class-target += "remove_sysroot_mkconfig_lib"
remove_sysroot_mkconfig_lib() {
rm -r "${SYSROOT_DESTDIR}${datadir}/grub/grub-mkconfig_lib"
}
-