From 5d956237085d2c38491120f7cf4d6e3429fabfa4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 11 Dec 2024 12:08:46 +0000 Subject: classes/utility-tasks: port do_listtasks to use bb.build.listtasks Instead of iterating every datastore value by hand to find tasks, use the new bb.build.listtasks() function (bitbake 185c4b) (From OE-Core rev: 466c3ed0d01bc70caa29d5eb8bb99f7d0e6e710c) Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/classes-global/utility-tasks.bbclass | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/meta/classes-global/utility-tasks.bbclass b/meta/classes-global/utility-tasks.bbclass index ae2da330b8..394cc3158d 100644 --- a/meta/classes-global/utility-tasks.bbclass +++ b/meta/classes-global/utility-tasks.bbclass @@ -9,18 +9,17 @@ do_listtasks[nostamp] = "1" python do_listtasks() { taskdescs = {} maxlen = 0 - for e in d.keys(): - if d.getVarFlag(e, 'task'): - maxlen = max(maxlen, len(e)) - if e.endswith('_setscene'): - desc = "%s (setscene version)" % (d.getVarFlag(e[:-9], 'doc') or '') - else: - desc = d.getVarFlag(e, 'doc') or '' - taskdescs[e] = desc - - tasks = sorted(taskdescs.keys()) - for taskname in tasks: - bb.plain("%s %s" % (taskname.ljust(maxlen), taskdescs[taskname])) + for t in bb.build.listtasks(d): + maxlen = max(maxlen, len(t)) + + if t.endswith('_setscene'): + desc = "%s (setscene version)" % (d.getVarFlag(t[:-9], 'doc') or '') + else: + desc = d.getVarFlag(t, 'doc') or '' + taskdescs[t] = desc + + for task, doc in sorted(taskdescs.items()): + bb.plain("%s %s" % (task.ljust(maxlen), doc)) } CLEANFUNCS ?= "" -- cgit v1.2.3-54-g00ecf