diff options
author | John Bowler <jbowler@nslu2-linux.org> | 2005-06-07 18:12:58 +0000 |
---|---|---|
committer | John Bowler <jbowler@nslu2-linux.org> | 2005-06-07 18:12:58 +0000 |
commit | 6df171ed659aa21947821f2a5b8c5af96b69e8d6 (patch) | |
tree | eba41f8408a5b2386b50e2a8c2f6f87a6c41075f /classes | |
parent | 4edd256d6e63ac02dcad309ff8b83d0f02cdaf59 (diff) |
Merge bk://oe-devel.bkbits.net/openembedded
into marsco.kalmiopsis:/home/nslu2/openembedded
2005/06/07 16:00:28+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/06/07 16:00:10+02:00 uni-frankfurt.de!mickeyl
wireless tools: package libiw (again)
2005/06/07 15:49:41+02:00 utwente.nl!koen
documentation.conf: typo--
2005/06/07 14:00:41+02:00 utwente.nl!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into bitbake.utwente.nl:/home/koen/OE/openembedded
2005/06/07 14:00:25+02:00 utwente.nl!koen
gkdial_1.8.1.bb: point SRC_URI to the hh.org sourcemirror. ~lart disappearing sources
2005/06/07 13:49:20+02:00 hrw.one.pl!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into home.hrw.one.pl:/home/hrw/zaurus/oe/openembedded
2005/06/07 13:48:31+02:00 hrw.one.pl!hrw
flex: unbreak non-native build, mark BROKEN on arm
2005/06/07 11:50:45+02:00 mn-solutions.de!schurig
wpa-supplicant_cvs.bb: fix path for the defaults
2005/06/07 10:24:03+02:00 mn-solutions.de!schurig
Fixes the "TypeError: cannot concatenate 'str' and 'NoneType' objects" we got for packages like atd, dbus etc in update-rc.d.bbclass.
Thanks do13
BKrev: 42a5e3aaLki5_YPl8KJqM8Qwgk5q4w
Diffstat (limited to 'classes')
-rw-r--r-- | classes/update-rc.d.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index 7583c88f83..a41dd7850c 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -48,7 +48,7 @@ python populate_packages_prepend () { if not prerm: prerm = '#!/bin/sh\n' prerm += bb.data.getVar('updatercd_prerm', localdata, 1) - bb.data.setVar('pkg_prerm%s' % pkg, prerm, d) + bb.data.setVar('pkg_prerm_%s' % pkg, prerm, d) pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1) if pkgs == None: |