Misc fixes
cover Misc fixes
The following changes since commit f975ca2cf728561bd6317ed8f76303598546113a:
runqueue: Fix silly variable overlap (2014-02-15 14:01:55 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib paule/bb-sigfixes
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=paule/sigfixes
Paul Eggleton (2):
parse: make vars_from_file return None for non-recipes
build: fix handling of task override for tasks with underscores in
their names
lib/bb/build.py | 2 +- lib/bb/parse/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
1.8.5.3
PATCH 1/2 parse: make vars_from_file return None for non-recipes
It doesn't really make sense to set PN from .conf files, for example. More concretely, this avoids the config hash changing unnecessarily within Hob due to PN effectively changing (since bblayers.conf is parsed first and then .hob.conf).
--- lib/bb/parse/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bb/parse/__init__.py +1 -1
@@ -127,7 +127,7 @@ def resolve_file(fn, d): # Used by OpenEmbedded metadata __pkgsplit_cache__={} def vars_from_file(mypkg, d): - if not mypkg: + if not mypkg or not mypkg.endswith((".bb", ".bbappend")): return (None, None, None) if mypkg in __pkgsplit_cache__: return __pkgsplit_cache__[mypkg]
Signature · 1 line
1.8.5.3
PATCH 2/2 build: fix handling of task override for tasks with underscores in their names
In reply to Paul EggletonTasks whose names contain underscores (such as do_populate_sdk in OE) when converted to a task override do not function properly. If we replace underscores with hyphens we can still have a working override for these tasks.
--- lib/bb/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bb/build.py +1 -1
@@ -330,7 +330,7 @@ def _task_data(fn, task, d): localdata.setVar('BB_FILENAME', fn) localdata.setVar('BB_CURRENTTASK', task[3:]) localdata.setVar('OVERRIDES', 'task-%s:%s' % - (task[3:], d.getVar('OVERRIDES', False))) + (task[3:].replace('_', '-'), d.getVar('OVERRIDES', False))) localdata.finalize() bb.data.expandKeys(localdata) return localdata
Signature · 1 line
1.8.5.3