From: Steve Sakoman <steve@sakoman.com>
Date: Wed, 5 Aug 2009 22:23:05 +0000 (-0700)
Subject: gconf.bbclass: adjust the ordering of things so that a package pkg_postinst_append... 
X-Git-Tag: Release-2010-05/1~2772
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e4f48a748a6c6ed73e68db307eaca5cec7ebc7c;p=openembedded.git

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
---

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)