summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2015-09-24 16:02:23 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-29 14:11:06 +0100
commit5e423237f9f4ff7e7e03bf066b0142ba4bd82219 (patch)
tree4da22e0236a46b1fa75fd445836836e17bd4f8b9
parentce9a7f1819a1897878ce154b3ee7e727a76165b0 (diff)
downloadbitbake-5e423237f9f4ff7e7e03bf066b0142ba4bd82219.zip
utils: only add layer once in edit_bblayers_conf()
Prevent edit_bblayers_conf() from adding layer(s) multiple times. This happened when BBLAYERS variable was "listed" multiple times in bblayer.conf - i.e. the configuration was split into multiple separate assignments. [YOCTO #8316] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 91faa494..9b550ef3 100644
--- a/lib/bb/utils.py
+++ b/lib/bb/utils.py
@@ -1249,6 +1249,7 @@ def edit_bblayers_conf(bblayers_conf, add, remove):
bblayers.append(addlayer)
else:
notadded.append(addlayer)
+ del addlayers[:]
if updated:
return (bblayers, None, 2, False)