From 5680bf11f2e5877782d0101d5b8a5ed24d1ddbce Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 23 Nov 2011 08:48:31 +0000 Subject: 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 --- meta/classes/gconf.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes/gconf.bbclass') 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 -- cgit 1.2.3-korg