summaryrefslogtreecommitdiffstats
path: root/meta/classes/gconf.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-23 08:48:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-23 08:48:34 +0000
commit5680bf11f2e5877782d0101d5b8a5ed24d1ddbce (patch)
tree2d6f21c84483e16c753222da75c4cba9b54b8791 /meta/classes/gconf.bbclass
parentb8328a132efd515515bb2c200271a8960f0d783b (diff)
downloadopenembedded-core-5680bf11f2e5877782d0101d5b8a5ed24d1ddbce.tar.gz
openembedded-core-5680bf11f2e5877782d0101d5b8a5ed24d1ddbce.tar.bz2
openembedded-core-5680bf11f2e5877782d0101d5b8a5ed24d1ddbce.zip
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>
Diffstat (limited to 'meta/classes/gconf.bbclass')
-rw-r--r--meta/classes/gconf.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index bffc92ea7a..71926b7818 100644
--- 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