summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-10 14:19:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-10 14:46:38 +0100
commit79ef0eab3555dc9e9994e899aa00a70ed8573c3c (patch)
tree8b7c29fe859dc3805b68adacdf4eb040b3bacf5e
parent1f68b0bd98ab0d9aeb7e5dae560d9d505ffac7c3 (diff)
downloadpoky-79ef0eab3555dc9e9994e899aa00a70ed8573c3c.tar.gz
bitbake: cooker: Add compability handling for multiconfig: prefix migration
This allows "multiconfig:" targets to continue to work by internally mapping them to the new "mc:" naming, allowing older builds to work as before. (Bitbake rev: c4d90890547af642e99cc541af3415df3559563e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 855a180523..e0cbed5378 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1600,6 +1600,9 @@ class BBCooker:
1600 for pkg in pkgs_to_build: 1600 for pkg in pkgs_to_build:
1601 if pkg in ignore: 1601 if pkg in ignore:
1602 parselog.warning("Explicit target \"%s\" is in ASSUME_PROVIDED, ignoring" % pkg) 1602 parselog.warning("Explicit target \"%s\" is in ASSUME_PROVIDED, ignoring" % pkg)
1603 if pkg.startswith("multiconfig:"):
1604 pkgs_to_build.remove(pkg)
1605 pkgs_to_build.append(pkg.replace("multiconfig:", "mc:"))
1603 1606
1604 if 'world' in pkgs_to_build: 1607 if 'world' in pkgs_to_build:
1605 pkgs_to_build.remove('world') 1608 pkgs_to_build.remove('world')