summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cooker.py
diff options
context:
space:
mode:
authorTomasz Dziendzielski <tomasz.dziendzielski@gmail.com>2021-01-30 20:47:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-06 09:12:00 +0000
commit1d2fe91db54e171fe66a697596a8f268d6ca8bbe (patch)
treedbbd6c352219e884a7aa6d32bcc9c560be8702d1 /bitbake/lib/bb/cooker.py
parent2fcbd0f11547d21bd18dbbc555a95a531beb5e63 (diff)
downloadpoky-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/cooker.py')
-rw-r--r--bitbake/lib/bb/cooker.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 83cfee7fb4..4446addc77 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -614,7 +614,7 @@ class BBCooker:
614 # Replace string such as "mc:*:bash" 614 # Replace string such as "mc:*:bash"
615 # into "mc:A:bash mc:B:bash bash" 615 # into "mc:A:bash mc:B:bash bash"
616 for k in targetlist: 616 for k in targetlist:
617 if k.startswith("mc:"): 617 if k.startswith("mc:") and k.count(':') >= 2:
618 if wildcard: 618 if wildcard:
619 bb.fatal('multiconfig conflict') 619 bb.fatal('multiconfig conflict')
620 if k.split(":")[1] == "*": 620 if k.split(":")[1] == "*":
@@ -648,7 +648,7 @@ class BBCooker:
648 for k in fulltargetlist: 648 for k in fulltargetlist:
649 origk = k 649 origk = k
650 mc = "" 650 mc = ""
651 if k.startswith("mc:"): 651 if k.startswith("mc:") and k.count(':') >= 2:
652 mc = k.split(":")[1] 652 mc = k.split(":")[1]
653 k = ":".join(k.split(":")[2:]) 653 k = ":".join(k.split(":")[2:])
654 ktask = task 654 ktask = task