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/cache.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/cache.py')
-rw-r--r-- | bitbake/lib/bb/cache.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 36270d0093..c85effd6f0 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -238,7 +238,7 @@ def virtualfn2realfn(virtualfn): | |||
238 | Convert a virtual file name to a real one + the associated subclass keyword | 238 | Convert a virtual file name to a real one + the associated subclass keyword |
239 | """ | 239 | """ |
240 | mc = "" | 240 | mc = "" |
241 | if virtualfn.startswith('mc:'): | 241 | if virtualfn.startswith('mc:') and virtualfn.count(':') >= 2: |
242 | elems = virtualfn.split(':') | 242 | elems = virtualfn.split(':') |
243 | mc = elems[1] | 243 | mc = elems[1] |
244 | virtualfn = ":".join(elems[2:]) | 244 | virtualfn = ":".join(elems[2:]) |
@@ -268,7 +268,7 @@ def variant2virtual(realfn, variant): | |||
268 | """ | 268 | """ |
269 | if variant == "": | 269 | if variant == "": |
270 | return realfn | 270 | return realfn |
271 | if variant.startswith("mc:"): | 271 | if variant.startswith("mc:") and variant.count(':') >= 2: |
272 | elems = variant.split(":") | 272 | elems = variant.split(":") |
273 | if elems[2]: | 273 | if elems[2]: |
274 | return "mc:" + elems[1] + ":virtual:" + ":".join(elems[2:]) + ":" + realfn | 274 | return "mc:" + elems[1] + ":virtual:" + ":".join(elems[2:]) + ":" + realfn |