summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-06-12 10:37:02 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-06-12 10:37:02 +0000
commit822ea0e69894d3e6329d29e111b6d14462fbf8a2 (patch)
tree401768fe900f2d87730b69fd7a531caf671ec123 /bitbake
parentd99418ab4ab6d3f93ab5c41eeaac5f7c280960b9 (diff)
downloadpoky-822ea0e69894d3e6329d29e111b6d14462fbf8a2.tar.gz
bitbake: apply r1075 from upstream to get postinsts working again
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4625 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/ChangeLog1
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/ChangeLog b/bitbake/ChangeLog
index 62be6ea126..561b618ae4 100644
--- a/bitbake/ChangeLog
+++ b/bitbake/ChangeLog
@@ -41,6 +41,7 @@ Changes in BitBake 1.8.x:
41 - Add PERSISTENT_DIR to store the PersistData in a persistent 41 - Add PERSISTENT_DIR to store the PersistData in a persistent
42 directory != the cache dir. 42 directory != the cache dir.
43 - Add md5 and sha256 checksum generation functions to utils.py 43 - Add md5 and sha256 checksum generation functions to utils.py
44 - Revert the '-' character fix in class names since it breaks things
44 45
45Changes in BitBake 1.8.10: 46Changes in BitBake 1.8.10:
46 - Psyco is available only for x86 - do not use it on other architectures. 47 - Psyco is available only for x86 - do not use it on other architectures.
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 764def8ec0..d7bf6d4f37 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -93,7 +93,7 @@ def handle(fn, d, include = 0):
93 init(d) 93 init(d)
94 94
95 if ext == ".bbclass": 95 if ext == ".bbclass":
96 __classname__ = root.replace('-','_') 96 __classname__ = root
97 classes.append(__classname__) 97 classes.append(__classname__)
98 __inherit_cache = data.getVar('__inherit_cache', d) or [] 98 __inherit_cache = data.getVar('__inherit_cache', d) or []
99 if not fn in __inherit_cache: 99 if not fn in __inherit_cache:
@@ -247,7 +247,7 @@ def feeder(lineno, s, fn, root, d):
247 247
248 m = __func_start_regexp__.match(s) 248 m = __func_start_regexp__.match(s)
249 if m: 249 if m:
250 __infunc__ = (m.group("func") or "__anonymous").replace('-','_') 250 __infunc__ = m.group("func") or "__anonymous"
251 key = __infunc__ 251 key = __infunc__
252 if data.getVar(key, d): 252 if data.getVar(key, d):
253# clean up old version of this piece of metadata, as its 253# clean up old version of this piece of metadata, as its