summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorChris Laplante <chris.laplante@agilent.com>2020-02-24 10:44:01 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-07 16:07:00 +0000
commit8b190c3e134ffb9fb7454e78718c6a9369770f62 (patch)
tree68469721d5c71031c5d571ef50755549530f7358 /bitbake/lib/bb
parentcc1ab55c14d086087ac4f097e206de714222b6bd (diff)
downloadpoky-8b190c3e134ffb9fb7454e78718c6a9369770f62.tar.gz
bitbake: runqueue: teach runonly/runall to accept "do_task" as well as "task"
Previously --runonly=do_task would give a misleading error like: ERROR: Could not find any tasks with the tasknames ['do_task'] to run within the recipes of the taskgraphs of the targets... The problem is that BitBake tried to find "do_do_task". So teach it to only add the do_ prefix if it's not already there. (Bitbake rev: 694904bde980606dc67c201da61f4fb685679b17) Signed-off-by: Chris Laplante <chris.laplante@agilent.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/runqueue.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 71108eeed7..32966b4f7c 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -920,9 +920,11 @@ class RunQueueData:
920 runq_build = {} 920 runq_build = {}
921 921
922 for task in self.cooker.configuration.runall: 922 for task in self.cooker.configuration.runall:
923 if not task.startswith("do_"):
924 task = "do_{0}".format(task)
923 runall_tids = set() 925 runall_tids = set()
924 for tid in list(self.runtaskentries): 926 for tid in list(self.runtaskentries):
925 wanttid = fn_from_tid(tid) + ":do_%s" % task 927 wanttid = "{0}:{1}".format(fn_from_tid(tid), task)
926 if wanttid in delcount: 928 if wanttid in delcount:
927 self.runtaskentries[wanttid] = delcount[wanttid] 929 self.runtaskentries[wanttid] = delcount[wanttid]
928 if wanttid in self.runtaskentries: 930 if wanttid in self.runtaskentries:
@@ -949,7 +951,9 @@ class RunQueueData:
949 runq_build = {} 951 runq_build = {}
950 952
951 for task in self.cooker.configuration.runonly: 953 for task in self.cooker.configuration.runonly:
952 runonly_tids = { k: v for k, v in self.runtaskentries.items() if taskname_from_tid(k) == "do_%s" % task } 954 if not task.startswith("do_"):
955 task = "do_{0}".format(task)
956 runonly_tids = { k: v for k, v in self.runtaskentries.items() if taskname_from_tid(k) == task }
953 957
954 for tid in list(runonly_tids): 958 for tid in list(runonly_tids):
955 mark_active(tid,1) 959 mark_active(tid,1)