[oe-commits] org.oe.dev make sure update-rc is always executed in an offline postinst (from poky r4976)

[mickeyl commit]

make sure update-rc is always executed in an offline postinst (from poky r4976)
(Note: This fixes (among other things) dbus not being started on first boot)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: bd558b4e8d1fe7232bbd7e2159b0accdb9718868
ViewMTN: http://monotone.openembedded.org/revision/info/bd558b4e8d1fe7232bbd7e2159b0accdb9718868
Files:
1
classes/update-rc.d.bbclass
Diffs:

#
# mt diff -ra65bd3057dfdae09f60613afb73a8cc9d95e0fd2 -rbd558b4e8d1fe7232bbd7e2159b0accdb9718868
#
#
#
# patch "classes/update-rc.d.bbclass"
#  from [aad4a9f7c2ea238e727751a6fd3e2675923cc9be]
#    to [08db86d0e91f2c7324b4f7f108a642e92cf9d5c9]
#
============================================================
--- classes/update-rc.d.bbclass	aad4a9f7c2ea238e727751a6fd3e2675923cc9be
+++ classes/update-rc.d.bbclass	08db86d0e91f2c7324b4f7f108a642e92cf9d5c9
@@ -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: