From: Robert Yang Date: Wed, 1 Jan 2014 03:22:15 +0000 (+0800) Subject: gconf.bbclass: remove --disable-schemas-install X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34957 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84fa245b1d1e7935094e3b8a452d69461dc3dcbb;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git gconf.bbclass: remove --disable-schemas-install Gnome has moved the schemas to the gsettings-desktop-schemas pkg, so there is no --disable-schemas-install option any more, and we already have the gsettings-desktop-schemas recipe, so remove it, it wil fix the warning: configure was passed unrecognised options: --disable-schemas-install Signed-off-by: Robert Yang Signed-off-by: Saul Wold --- diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass index e9076b27790..8ebb5120edf 100644 --- a/meta/classes/gconf.bbclass +++ b/meta/classes/gconf.bbclass @@ -7,12 +7,6 @@ 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"