diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 16:28:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 16:29:41 +0000 |
| commit | d93fdb740e6b73fe168f64575f4ceb4b3db17504 (patch) | |
| tree | 3ba86baa65b9c7bb84cd8a43cde6b61fbf89ebab /meta | |
| parent | a484b35b818768487ff27cf06b8c5d4e128126af (diff) | |
| download | openembedded-core-d93fdb740e6b73fe168f64575f4ceb4b3db17504.tar.gz | |
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.
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/gconf.bbclass | 6 |
1 files changed, 6 insertions, 0 deletions
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" |