summaryrefslogtreecommitdiffstats
path: root/meta/classes/gconf.bbclass
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-06-26 11:10:23 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-28 16:23:18 +0100
commitf9f2e0309a03a4dc9ed5e6cff7db6f29962b7d60 (patch)
tree4be3991bb204eb342859891011099eec6742749c /meta/classes/gconf.bbclass
parentbb5095d3f73a00222f50f9dd2cf8dc27cc72b4a2 (diff)
downloadopenembedded-core-f9f2e0309a03a4dc9ed5e6cff7db6f29962b7d60.tar.gz
openembedded-core-f9f2e0309a03a4dc9ed5e6cff7db6f29962b7d60.tar.bz2
openembedded-core-f9f2e0309a03a4dc9ed5e6cff7db6f29962b7d60.zip
gconf.bbclass: don't register schemas in the install stage
Previously this was installing schemas in the sysroot, which is wrong for native packages as nothing should touch the sysroot directly, and even more wrong for non-native packages as the sysroot is irrelevant. So, export the environment variable that stops the registration happening at install time. The postinst script will handle the non-native case, and for the sysroot I've opened #2648. This isn't a massive problem as nothing to my knowledge actually installs schemas to the sysroot. [YOCTO #2245] Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes/gconf.bbclass')
-rw-r--r--meta/classes/gconf.bbclass12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index a966c268bb..fb9f701b37 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -1,10 +1,18 @@
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
+# These are for when gconftool is used natively and the prefix isn't necessarily
+# the sysroot. TODO: replicate the postinst logic for -native packages going
+# into sysroot as they won't be running their own install-time schema
+# registration (disabled below) nor the postinst script (as they don't happen).
export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults"
export GCONF_BACKEND_DIR = "${STAGING_LIBDIR_NATIVE}/GConf/2"
+# Disable install-time schema registration as we're a packaging system so this
+# happens in the postinst script, not at install time. Set both the configure
+# script option and the traditional envionment variable just to make sure.
+EXTRA_OECONF += "--disable-schemas-install"
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = "1"
+
gconf_postinst() {
if [ "x$D" != "x" ]; then
exit 1