summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-01-01 11:22:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-06 11:12:30 +0000
commit84fa245b1d1e7935094e3b8a452d69461dc3dcbb (patch)
treec0c35da129ee9d9f7321aac118ca78097ef60ed1
parent4cee162c292915e68e8efcab68a31ba0e48105e9 (diff)
downloadopenembedded-core-84fa245b1d1e7935094e3b8a452d69461dc3dcbb.tar.gz
openembedded-core-84fa245b1d1e7935094e3b8a452d69461dc3dcbb.tar.bz2
openembedded-core-84fa245b1d1e7935094e3b8a452d69461dc3dcbb.zip
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 <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/classes/gconf.bbclass6
1 files changed, 0 insertions, 6 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index e9076b2779..8ebb5120ed 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"