gconf.bbclass: adjust the ordering of things so that a package pkg_postinst_append...
authorSteve Sakoman <steve@sakoman.com>
Wed, 5 Aug 2009 22:23:05 +0000 (15:23 -0700)
committerKoen Kooi <koen@openembedded.org>
Sat, 8 Aug 2009 09:20:05 +0000 (11:20 +0200)
This is important since recipes like gpanel need to to execute gconftool-2 --load after the gconf class code has processed the schema info

classes/gconf.bbclass

index 99f33e4..47df063 100644 (file)
@@ -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)