update-rc.d.bbclass: add code at start of post install scripts so it will be called...

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4976 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 3051b7933f1186eb2d87e8b2aa40c1750ff178b8..9b832c00128f5355f69ab9c2a095f639089e8590 100644 (file)
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -45,10 +45,12 @@ python populate_packages_prepend () {
                bb.data.setVar("OVERRIDES", "%s:%s" % (pkg, overrides), localdata)
                bb.data.update_data(localdata)
 
-               postinst = bb.data.getVar('pkg_postinst', localdata, 1)
-               if not postinst:
-                       postinst = '#!/bin/sh\n'
+               postinst = '#!/bin/sh\n'
                postinst += bb.data.getVar('updatercd_postinst', localdata, 1)
+               try:
+                       postinst += bb.data.getVar('pkg_postinst', localdata, 1)
+               except:
+                       pass
                bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
                prerm = bb.data.getVar('pkg_prerm', localdata, 1)
                if not prerm: