diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-12-17 21:48:07 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-05-05 14:45:25 +0100 |
| commit | e01f928266fc0ee1c298cc06d94fa72dd11a5e11 (patch) | |
| tree | d4d9fc70d14779218cf639e4f25f55c9e70256c4 | |
| parent | d80c2eb37103e6f6cef0b2df387b84b2472f455f (diff) | |
gconf.bbclass: Sync with Poky
* Only add the postinstall script header if an existing postinstall isn't set
* Remove the unneeded python import
* Fix the indentation in the postinstall function
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | classes/gconf.bbclass | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass index f55ae2c2ae..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,7 +30,7 @@ fi } python populate_packages_append () { - import os.path, re + import re packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) @@ -45,10 +45,9 @@ python populate_packages_append () { if schemas != []: bb.note("adding gconf postinst and prerm scripts to %s" % pkg) bb.data.setVar('SCHEMA_FILES', " ".join(schemas), d) - postinst = '#!/bin/sh\n' - pkgpostinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) - if pkgpostinst: - postinst += pkgpostinst + postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1) + if not postinst: + postinst = '#!/bin/sh\n' postinst += bb.data.getVar('gconf_postinst', d, 1) bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d) prerm = bb.data.getVar('pkg_prerm_%s' % pkg, d, 1) or bb.data.getVar('pkg_prerm', d, 1) |