[oe-commits] : make sure update-rc is always executed in an offline postinst ( from poky r4976)
OE GIT Trial
gittrial at amethyst.openembedded.net
Tue Jul 29 13:42:28 UTC 2008
Module: OE.dev
Branch: master
Commit: 5f04f6a67f56a836682213fb471dd45263f0327c
URL: http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=5f04f6a67f56a836682213fb471dd45263f0327c
Author: <mickeyl at openembedded.org>
Date: Tue Jul 29 13:36:42 2008 +0000
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)
---
classes/update-rc.d.bbclass | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass
index 3051b79..9b832c0 100644
--- a/classes/update-rc.d.bbclass
+++ b/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:
More information about the Openembedded-commits
mailing list