diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-07 13:35:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-10 14:46:38 +0100 |
commit | 1f68b0bd98ab0d9aeb7e5dae560d9d505ffac7c3 (patch) | |
tree | fc1d636189ead1d83a5d252bddc5240c5b25db7f /bitbake/lib/bb/runqueue.py | |
parent | 32df42cff5370bb0bda51f0f637357c18ee3b1eb (diff) | |
download | poky-1f68b0bd98ab0d9aeb7e5dae560d9d505ffac7c3.tar.gz |
bitbake: multiconfig: Switch from 'multiconfig' -> 'mc'
After real world use its clear the "multiconfig:" prefix to multiconfig tasks,
whilst clear, is also clumbersome. Switch to use the short version instead.
mcdepends will continue to work with "multiconfig:" for now as well. The commandline
will only accept mc: going forward.
[YOCTO #11168]
(Bitbake rev: 821daf093b76504067a8b77dfa4b181af6ec92b4)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index d573ed460e..010b085010 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -39,7 +39,7 @@ def taskname_from_tid(tid): | |||
39 | return tid.rsplit(":", 1)[1] | 39 | return tid.rsplit(":", 1)[1] |
40 | 40 | ||
41 | def mc_from_tid(tid): | 41 | def mc_from_tid(tid): |
42 | if tid.startswith('multiconfig:'): | 42 | if tid.startswith('mc:'): |
43 | return tid.split(':')[1] | 43 | return tid.split(':')[1] |
44 | return "" | 44 | return "" |
45 | 45 | ||
@@ -48,12 +48,12 @@ def split_tid(tid): | |||
48 | return (mc, fn, taskname) | 48 | return (mc, fn, taskname) |
49 | 49 | ||
50 | def split_tid_mcfn(tid): | 50 | def split_tid_mcfn(tid): |
51 | if tid.startswith('multiconfig:'): | 51 | if tid.startswith('mc:'): |
52 | elems = tid.split(':') | 52 | elems = tid.split(':') |
53 | mc = elems[1] | 53 | mc = elems[1] |
54 | fn = ":".join(elems[2:-1]) | 54 | fn = ":".join(elems[2:-1]) |
55 | taskname = elems[-1] | 55 | taskname = elems[-1] |
56 | mcfn = "multiconfig:" + mc + ":" + fn | 56 | mcfn = "mc:" + mc + ":" + fn |
57 | else: | 57 | else: |
58 | tid = tid.rsplit(":", 1) | 58 | tid = tid.rsplit(":", 1) |
59 | mc = "" | 59 | mc = "" |
@@ -65,7 +65,7 @@ def split_tid_mcfn(tid): | |||
65 | 65 | ||
66 | def build_tid(mc, fn, taskname): | 66 | def build_tid(mc, fn, taskname): |
67 | if mc: | 67 | if mc: |
68 | return "multiconfig:" + mc + ":" + fn + ":" + taskname | 68 | return "mc:" + mc + ":" + fn + ":" + taskname |
69 | return fn + ":" + taskname | 69 | return fn + ":" + taskname |
70 | 70 | ||
71 | class RunQueueStats: | 71 | class RunQueueStats: |