diff options
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/build.py | 1 | ||||
-rw-r--r-- | bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 7e4ab9f64c..d6418e40b3 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py | |||
@@ -569,7 +569,6 @@ exit $ret | |||
569 | def _task_data(fn, task, d): | 569 | def _task_data(fn, task, d): |
570 | localdata = bb.data.createCopy(d) | 570 | localdata = bb.data.createCopy(d) |
571 | localdata.setVar('BB_FILENAME', fn) | 571 | localdata.setVar('BB_FILENAME', fn) |
572 | localdata.setVar('BB_CURRENTTASK', task[3:]) | ||
573 | localdata.setVar('OVERRIDES', 'task-%s:%s' % | 572 | localdata.setVar('OVERRIDES', 'task-%s:%s' % |
574 | (task[3:].replace('_', '-'), d.getVar('OVERRIDES', False))) | 573 | (task[3:].replace('_', '-'), d.getVar('OVERRIDES', False))) |
575 | localdata.finalize() | 574 | localdata.finalize() |
diff --git a/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf b/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf index efebf001a9..2645c0e985 100644 --- a/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf +++ b/bitbake/lib/bb/tests/runqueue-tests/conf/bitbake.conf | |||
@@ -12,6 +12,6 @@ STAMP = "${TMPDIR}/stamps/${PN}" | |||
12 | T = "${TMPDIR}/workdir/${PN}/temp" | 12 | T = "${TMPDIR}/workdir/${PN}/temp" |
13 | BB_NUMBER_THREADS = "4" | 13 | BB_NUMBER_THREADS = "4" |
14 | 14 | ||
15 | BB_HASHBASE_WHITELIST = "BB_CURRENT_MC BB_HASHSERVE TMPDIR TOPDIR SLOWTASKS SSTATEVALID FILE" | 15 | BB_HASHBASE_WHITELIST = "BB_CURRENT_MC BB_HASHSERVE TMPDIR TOPDIR SLOWTASKS SSTATEVALID FILE BB_CURRENTTASK" |
16 | 16 | ||
17 | include conf/multiconfig/${BB_CURRENT_MC}.conf | 17 | include conf/multiconfig/${BB_CURRENT_MC}.conf |