summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-06-26 10:10:23 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-29 14:49:34 (GMT)
commit2dcbb48df9a135e29fa38e3321cd82ac7b294c2c (patch)
tree73c5504f4f170cd491c18b1767401731d3a3833b /meta/classes
parentfb2335fa2bf8ff2882b12e1c5a1d53dbd0528577 (diff)
downloadpoky-2dcbb48df9a135e29fa38e3321cd82ac7b294c2c.tar.gz
gconf.bbclass: don't register schemas in the install stage
Previously this was installing schemas in the sysroot, which is wrong for native packages as nothing should touch the sysroot directly, and even more wrong for non-native packages as the sysroot is irrelevant. So, export the environment variable that stops the registration happening at install time. The postinst script will handle the non-native case, and for the sysroot I've opened #2648. This isn't a massive problem as nothing to my knowledge actually installs schemas to the sysroot. [YOCTO #2245] (From OE-Core rev: 741146fa90f28f7ce8d82ee7f7e254872d519724) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/gconf.bbclass12
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass
index a966c26..fb9f701 100644
--- a/meta/classes/gconf.bbclass
+++ b/meta/classes/gconf.bbclass
@@ -1,10 +1,18 @@
1DEPENDS += "gconf gconf-native" 1DEPENDS += "gconf gconf-native"
2 2
3# This is referenced by the gconf m4 macros and would default to the value hardcoded 3# These are for when gconftool is used natively and the prefix isn't necessarily
4# into gconf at compile time otherwise 4# the sysroot. TODO: replicate the postinst logic for -native packages going
5# into sysroot as they won't be running their own install-time schema
6# registration (disabled below) nor the postinst script (as they don't happen).
5export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults" 7export GCONF_SCHEMA_INSTALL_SOURCE = "xml:merged:${STAGING_DIR_NATIVE}${sysconfdir}/gconf/gconf.xml.defaults"
6export GCONF_BACKEND_DIR = "${STAGING_LIBDIR_NATIVE}/GConf/2" 8export GCONF_BACKEND_DIR = "${STAGING_LIBDIR_NATIVE}/GConf/2"
7 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.
13EXTRA_OECONF += "--disable-schemas-install"
14export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL = "1"
15
8gconf_postinst() { 16gconf_postinst() {
9if [ "x$D" != "x" ]; then 17if [ "x$D" != "x" ]; then
10 exit 1 18 exit 1