diff options
| author |   Steve Sakoman <steve@sakoman.com> | 2009-08-05 15:23:05 -0700 |
|---|---|---|
| committer |   Koen Kooi <koen@openembedded.org> | 2009-08-08 11:20:05 +0200 |
| commit | 6e4f48a748a6c6ed73e68db307eaca5cec7ebc7c (patch) | |
| tree | ea7f53cdf6a54b60506cf1a3548f68c228318ce4 /classes | |
| parent | 30f651216518cbc89ab64b38eaddb1d4417c0ef7 (diff) | |
| download | openembedded-6e4f48a748a6c6ed73e68db307eaca5cec7ebc7c.tar.gz | |
gconf.bbclass: adjust the ordering of things so that a package pkg_postinst_append is executed after the class postinst.
This is important since recipes like gpanel need to to execute gconftool-2 --load after the gconf class code has processed the schema info
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/gconf.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass index 99f33e433a..47df06329b 100644 --- a/classes/gconf.bbclass +++ b/classes/gconf.bbclass @@ -45,9 +45,10 @@ 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 = 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 = '#!/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('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) |