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>

diff --git a/lib/bb/utils.py b/lib/bb/utils.py
index 91faa494ca5adb84e6997c5570ab3e88d2b8558b..9b550ef3f1c4d185716063bcd41ba948607e0161 100644 (file)
--- 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)