diff options
author | Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> | 2021-01-30 20:47:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-06 09:12:00 +0000 |
commit | 1d2fe91db54e171fe66a697596a8f268d6ca8bbe (patch) | |
tree | dbbd6c352219e884a7aa6d32bcc9c560be8702d1 /bitbake/lib/bb/runqueue.py | |
parent | 2fcbd0f11547d21bd18dbbc555a95a531beb5e63 (diff) | |
download | poky-1d2fe91db54e171fe66a697596a8f268d6ca8bbe.tar.gz |
bitbake: lib/bb: Don't treat mc recipe (Midnight Commander) as a multiconfig target
When we run `devtool build mc` recipe's task dependencies are expanded
to "mc:do_populate_sysroot" where "mc" name is treated as multiconfig
and "do_package_sysroot" as multiconfigname.
| ERROR: Multiconfig dependency mc:do_populate_sysroot depends on
| nonexistent multiconfig configuration named do_populate_sysroot
(Bitbake rev: 3ce4b2caccfe608a54dff159459f3687ea610597)
Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 28bdadb45e..7d493eb402 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -38,7 +38,7 @@ def taskname_from_tid(tid): | |||
38 | return tid.rsplit(":", 1)[1] | 38 | return tid.rsplit(":", 1)[1] |
39 | 39 | ||
40 | def mc_from_tid(tid): | 40 | def mc_from_tid(tid): |
41 | if tid.startswith('mc:'): | 41 | if tid.startswith('mc:') and tid.count(':') >= 2: |
42 | return tid.split(':')[1] | 42 | return tid.split(':')[1] |
43 | return "" | 43 | return "" |
44 | 44 | ||
@@ -47,13 +47,13 @@ def split_tid(tid): | |||
47 | return (mc, fn, taskname) | 47 | return (mc, fn, taskname) |
48 | 48 | ||
49 | def split_mc(n): | 49 | def split_mc(n): |
50 | if n.startswith("mc:"): | 50 | if n.startswith("mc:") and n.count(':') >= 2: |
51 | _, mc, n = n.split(":", 2) | 51 | _, mc, n = n.split(":", 2) |
52 | return (mc, n) | 52 | return (mc, n) |
53 | return ('', n) | 53 | return ('', n) |
54 | 54 | ||
55 | def split_tid_mcfn(tid): | 55 | def split_tid_mcfn(tid): |
56 | if tid.startswith('mc:'): | 56 | if tid.startswith('mc:') and tid.count(':') >= 2: |
57 | elems = tid.split(':') | 57 | elems = tid.split(':') |
58 | mc = elems[1] | 58 | mc = elems[1] |
59 | fn = ":".join(elems[2:-1]) | 59 | fn = ":".join(elems[2:-1]) |