From f4ae4399140ef61bafdd9223583a249279959ae1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 6 Jan 2014 16:28:53 +0000 Subject: Revert "gconf.bbclass: remove --disable-schemas-install" This reverts commit 84fa245b1d1e7935094e3b8a452d69461dc3dcbb. Ross Burton comments that: *Some* packages have migrated away from gconf to gsettings. Not all packages have done this, so anything still using gconf is now broken. Note that almost nothing in oe-core uses gsettings as we're still using the GTK+ 2 stack generally. The problem is that people are using gnome.bbclass which is a kitchen sink class, inheriting many other classes that may or may not be used. To resolve this warning gnome.bbclass should extend the sanity check whitelist with --disable-schemas-install as it is the class causing gconf.bbclass to be inherited on recipes that don't use gconf. Signed-off-by: Richard Purdie --- meta/classes/gconf.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'meta/classes/gconf.bbclass') diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass index 8ebb5120ed..e9076b2779 100644 --- a/meta/classes/gconf.bbclass +++ b/meta/classes/gconf.bbclass @@ -7,6 +7,12 @@ DEPENDS += "gconf gconf-native" 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 export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults" -- cgit v1.2.3-54-g00ecf