gconf: Ensure that GCONF_SCHEMA_INSTALL_SOURCE uses correct paths

The gconf .m4 files use the path encoded into the gconf-native tools
by default to populate this variable. This doesn't work if we're
relocating the gconf-native binaries. By setting this variable we
ensure that the m4 files always pick up the correct path.

This fixes errors seen on the yocto autobuilder.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index bffc92ea7a1e87926ad4844f1acd002ca30600c1..71926b7818185559fed6964f2aa695a645a4c338 100644 (file)
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -1,5 +1,9 @@
 DEPENDS += "gconf gconf-native"
 
+# This is referenced by the gconf m4 macros and would default to the value hardcoded
+# into gconf at compile time otherwise
+export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults"
+
 gconf_postinst() {
 if [ "x$D" != "x" ]; then
        exit 1