From: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Date: Thu, 24 Sep 2015 13:02:23 +0000 (+0300)
Subject: utils: only add layer once in edit_bblayers_conf()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e423237f9f4ff7e7e03bf066b0142ba4bd82219;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 91faa494ca5..9b550ef3f1c 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)