summaryrefslogtreecommitdiffstats
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:43 +0000
commit576587dae0eef3c6249d03bc27a045a0e5cf018c (patch)
tree6dbb96f2fddeef75515f1d0394a1fb1ba0d34747 /meta/recipes-bsp
parent97a3322229f823008726cfc014bd65bcf3af4624 (diff)
downloadopenembedded-core-contrib-576587dae0eef3c6249d03bc27a045a0e5cf018c.tar.gz
openembedded-core-contrib-576587dae0eef3c6249d03bc27a045a0e5cf018c.tar.bz2
openembedded-core-contrib-576587dae0eef3c6249d03bc27a045a0e5cf018c.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. (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>
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"
}
-