summaryrefslogtreecommitdiffstats
path: root/meta/classes/gconf.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-23 08:48:31 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-23 12:43:43 (GMT)
commit89a5b473767caf38dfaae4437e0543dd068276c3 (patch)
treea1dcd430a7f65c966b54350d6ae9c50a951036a9 /meta/classes/gconf.bbclass
parent7e17205d09dd57ff0571e767f1bacac84a7394c3 (diff)
downloadpoky-89a5b473767caf38dfaae4437e0543dd068276c3.tar.gz
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. (From OE-Core rev: 5680bf11f2e5877782d0101d5b8a5ed24d1ddbce) 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 bffc92e..71926b7 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -1,5 +1,9 @@
1DEPENDS += "gconf gconf-native" 1DEPENDS += "gconf gconf-native"
2 2
3# This is referenced by the gconf m4 macros and would default to the value hardcoded
4# into gconf at compile time otherwise
5export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults"
6
3gconf_postinst() { 7gconf_postinst() {
4if [ "x$D" != "x" ]; then 8if [ "x$D" != "x" ]; then
5 exit 1 9 exit 1