diff options
Diffstat (limited to 'classes/gconf.bbclass')
| -rw-r--r-- | classes/gconf.bbclass | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass index 99f33e433a..30e7ef7591 100644 --- a/classes/gconf.bbclass +++ b/classes/gconf.bbclass @@ -5,14 +5,14 @@ if [ "$1" = configure ]; then if [ "x$D" != "x" ]; then exit 1 fi - SCHEMA_LOCATION=/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 \ - --makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null - fi - done + SCHEMA_LOCATION=/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 \ + --makefile-install-rule $SCHEMA_LOCATION/$SCHEMA > /dev/null + fi + done fi } @@ -30,12 +30,12 @@ fi } python populate_packages_append () { - import os.path, re + import re packages = bb.data.getVar('PACKAGES', d, 1).split() - workdir = bb.data.getVar('WORKDIR', d, 1) + pkgdest = bb.data.getVar('PKGDEST', d, 1) for pkg in packages: - schema_dir = '%s/install/%s/etc/gconf/schemas' % (workdir, pkg) + schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) schemas = [] schema_re = re.compile(".*\.schemas$") if os.path.exists(schema_dir): |