diff options
Diffstat (limited to 'meta/classes/gconf.bbclass')
| -rw-r--r-- | meta/classes/gconf.bbclass | 80 |
1 files changed, 44 insertions, 36 deletions
diff --git a/meta/classes/gconf.bbclass b/meta/classes/gconf.bbclass index 095d04b1b8..4e0ee2e7d5 100644 --- a/meta/classes/gconf.bbclass +++ b/meta/classes/gconf.bbclass @@ -1,19 +1,30 @@ -DEPENDS += "gconf gconf-native" +DEPENDS += "gconf" +PACKAGE_WRITE_DEPS += "gconf-native" -# This is referenced by the gconf m4 macros and would default to the value hardcoded -# into gconf at compile time otherwise +# These are for when gconftool is used natively and the prefix isn't necessarily +# the sysroot. TODO: replicate the postinst logic for -native packages going +# into sysroot as they won't be running their own install-time schema +# registration (disabled below) nor the postinst script (as they don't happen). 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 - exit 1 + export GCONF_CONFIG_SOURCE="xml::$D${sysconfdir}/gconf/gconf.xml.defaults" +else + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` fi -SCHEMA_LOCATION=/etc/gconf/schemas + +SCHEMA_LOCATION=$D/etc/gconf/schemas for SCHEMA in ${SCHEMA_FILES}; do if [ -e $SCHEMA_LOCATION/$SCHEMA ]; then - HOME=/root GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ - gconftool-2 \ + HOME=$D/root gconftool-2 \ --makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null fi done @@ -31,33 +42,30 @@ done } python populate_packages_append () { - import re - packages = d.getVar('PACKAGES', True).split() - pkgdest = d.getVar('PKGDEST', True) - - for pkg in packages: - schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) - schemas = [] - schema_re = re.compile(".*\.schemas$") - if os.path.exists(schema_dir): - for f in os.listdir(schema_dir): - if schema_re.match(f): - schemas.append(f) - if schemas != []: - bb.note("adding gconf postinst and prerm scripts to %s" % pkg) - d.setVar('SCHEMA_FILES', " ".join(schemas)) - postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) - if not postinst: - postinst = '#!/bin/sh\n' - postinst += d.getVar('gconf_postinst', True) - d.setVar('pkg_postinst_%s' % pkg, postinst) - prerm = d.getVar('pkg_prerm_%s' % pkg, True) or d.getVar('pkg_prerm', True) - if not prerm: - prerm = '#!/bin/sh\n' - prerm += d.getVar('gconf_prerm', True) - d.setVar('pkg_prerm_%s' % pkg, prerm) - rdepends = d.getVar("RDEPENDS_%s" % pkg, True) or "" - rdepends += " gconf" - d.setVar("RDEPENDS_%s" % pkg, rdepends) - + import re + packages = d.getVar('PACKAGES').split() + pkgdest = d.getVar('PKGDEST') + + for pkg in packages: + schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) + schemas = [] + schema_re = re.compile(".*\.schemas$") + if os.path.exists(schema_dir): + for f in os.listdir(schema_dir): + if schema_re.match(f): + schemas.append(f) + if schemas != []: + bb.note("adding gconf postinst and prerm scripts to %s" % pkg) + d.setVar('SCHEMA_FILES', " ".join(schemas)) + postinst = d.getVar('pkg_postinst_%s' % pkg) + if not postinst: + postinst = '#!/bin/sh\n' + postinst += d.getVar('gconf_postinst') + d.setVar('pkg_postinst_%s' % pkg, postinst) + prerm = d.getVar('pkg_prerm_%s' % pkg) + if not prerm: + prerm = '#!/bin/sh\n' + prerm += d.getVar('gconf_prerm') + d.setVar('pkg_prerm_%s' % pkg, prerm) + d.appendVar("RDEPENDS_%s" % pkg, ' ' + d.getVar('MLPREFIX', False) + 'gconf') } |