summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-07-29 10:12:13 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-07-29 10:12:13 +0000
commit5e12400fcbb65264cda47604da2960d01819e27b (patch)
treefed83eb78b08d268c99142a608e6aed60d4c2b5c
parent34d7e090e89b4735f37adfb32e56a82fcff0bfc4 (diff)
downloadopenembedded-core-5e12400fcbb65264cda47604da2960d01819e27b.tar.gz
openembedded-core-5e12400fcbb65264cda47604da2960d01819e27b.tar.bz2
openembedded-core-5e12400fcbb65264cda47604da2960d01819e27b.tar.xz
openembedded-core-5e12400fcbb65264cda47604da2960d01819e27b.zip
update-rc.d.bbclass: add code at start of post install scripts so it will be called on host
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4976 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/classes/update-rc.d.bbclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 3051b7933..9b832c001 100644
--- 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: