diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-01-01 11:22:15 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-06 11:13:56 +0000 |
commit | 31fe1b67a27c9f5fc18f81ed29013859e6cd529c (patch) | |
tree | 35b24b2a52375b85a6c23dd58126c0a4b559d6c9 /meta/classes | |
parent | acfd890a4fe7fb1b3208d8beb8e08922f178d06f (diff) | |
download | poky-31fe1b67a27c9f5fc18f81ed29013859e6cd529c.tar.gz |
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
(From OE-Core rev: 84fa245b1d1e7935094e3b8a452d69461dc3dcbb)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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, 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" | |||
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 | |||
16 | gconf_postinst() { | 10 | gconf_postinst() { |
17 | if [ "x$D" != "x" ]; then | 11 | if [ "x$D" != "x" ]; then |
18 | export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults" | 12 | export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults" |