[oe-commits] Richard Purdie : gconf: Ensure that GCONF_SCHEMA_INSTALL_SOURCE uses correct paths
git at git.openembedded.org
git at git.openembedded.org
Wed Nov 23 12:47:54 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 5680bf11f2e5877782d0101d5b8a5ed24d1ddbce
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5680bf11f2e5877782d0101d5b8a5ed24d1ddbce
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Wed Nov 23 08:48:31 2011 +0000
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 at linuxfoundation.org>
---
meta/classes/gconf.bbclass | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index bffc92e..71926b7 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
More information about the Openembedded-commits
mailing list