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:30:28 +0000 |
commit | f4ae4399140ef61bafdd9223583a249279959ae1 (patch) | |
tree | bd88266c6771b3d734946924f7ed722e3cbecbc0 /meta/classes | |
parent | 2ee78e3ac45f220dddeb75e4436b114bb983d4ef (diff) | |
download | poky-f4ae4399140ef61bafdd9223583a249279959ae1.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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" | |||
7 | export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults" | 7 | export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults" |
8 | export GCONF_BACKEND_DIR = "${STAGING_LIBDIR_NATIVE}/GConf/2" | 8 | export GCONF_BACKEND_DIR = "${STAGING_LIBDIR_NATIVE}/GConf/2" |
9 | 9 | ||
10 | # Disable install-time schema registration as we're a packaging system so this | ||
11 | # happens in the postinst script, not at install time. Set both the configure | ||
12 | # script option and the traditional envionment variable just to make sure. | ||
13 | EXTRA_OECONF += "--disable-schemas-install" | ||
14 | export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = "1" | ||
15 | |||
10 | gconf_postinst() { | 16 | gconf_postinst() { |
11 | if [ "x$D" != "x" ]; then | 17 | if [ "x$D" != "x" ]; then |
12 | export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults" | 18 | export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults" |