Skip to contentSkip to conversation

Allow bitbake commands starting with do_

PATCH In review Alex Franco 2 participants 3 messages Aug 31, 2015 – Sep 1, 2015

lore
Share & tools
lore
#0 lore raw

v3 cover Allow bitbake commands starting with do_

The output of "bitbake, -c listtasks pkg" lists tasks with their real names (starting with "do_"), but then "bitbake -c do_task" fails, as "do_" always gets unconditionally prepended to task names. This patch handles this error by always removing "do_" from the beginning of task names when the runqueue is being constructed.

[YOCTO #7818]

Changes since v1: removed regex, using string.replace Changes since v2: removed string.replace, using slice

Alex Franco (1):
Allow bitbake commands starting with do_

 bitbake/lib/bb/runqueue.py | 4 ++++
 1 file changed, 4 insertions(+)
Signature · 1 line
2.5.1
#1 lore raw

PATCH v3 1/1 Allow bitbake commands starting with do_

The output of "bitbake, -c listtasks pkg" lists tasks with their real names (starting with "do_"), but then "bitbake -c do_task" fails, as "do_" always gets unconditionally prepended to task names. This patch handles this error by always removing "do_" from the beginning of task names when the runqueue is being constructed.

[YOCTO #7818]

---
 bitbake/lib/bb/runqueue.py | 4 ++++
 1 file changed, 4 insertions(+)
bitbake/lib/bb/runqueue.py +4 -0
index 0f99e5a..7b25e31 100644
@@ -634,6 +634,10 @@ class RunQueueData:
 
             fnid = taskData.build_targets[targetid][0]
             fn = taskData.fn_index[fnid]
+
+            if target[1].startswith("do_"):
+                target[1] = target[1][3:]
+
             self.target_pairs.append((fn, target[1]))
 
             if fnid in taskData.failed_fnids:
Signature · 1 line
2.5.1
#2 lore raw
Quoted 18 lines · Alex Franco

The output of "bitbake, -c listtasks pkg" lists tasks with their real names (starting with "do_"), but then "bitbake -c do_task" fails, as "do_" always gets unconditionally prepended to task names. This patch handles this error by always removing "do_" from the beginning of task names when the runqueue is being constructed.

[YOCTO #7818]

---
 bitbake/lib/bb/runqueue.py | 4 ++++
 1 file changed, 4 insertions(+)
bitbake/lib/bb/runqueue.py +0 -0
index 0f99e5a..7b25e31 100644

bitbake/lib/bb/runqueue.py class RunQueueData: · line 643

Quoted 10 lines
bitbake/lib/bb/runqueue.py +4 -0
@@ -634,6 +634,10 @@ class RunQueueData:
 
             fnid = taskData.build_targets[targetid][0]
             fn = taskData.fn_index[fnid]
+
+            if target[1].startswith("do_"):
+                target[1] = target[1][3:]
+
             self.target_pairs.append((fn, target[1]))
 
             if fnid in taskData.failed_fnids:

I tried this on the autobuilder and we saw cascades of failures, e.g:

https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/468/steps/BuildImages/logs/stdio

so clearly we need more thought on this. I prefer the .startswith over the regex as in general its much faster code than loading the re engine.

Cheers,

Richard