summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
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:38 +0100
commit226e7da26e594dbefc5ecc0731ace7117d402cfa (patch)
treeeaf4c1ec3fd2133371a1db51397976828c1b7668 /bitbake/lib/bb
parentd48b7ef607372488c1bf50762e4ca21773bf1e9a (diff)
downloadpoky-226e7da26e594dbefc5ecc0731ace7117d402cfa.tar.gz
bitbake: 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] (Bitbake rev: 5e423237f9f4ff7e7e03bf066b0142ba4bd82219) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 91faa494ca..9b550ef3f1 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -1249,6 +1249,7 @@ def edit_bblayers_conf(bblayers_conf, add, remove):
1249 bblayers.append(addlayer) 1249 bblayers.append(addlayer)
1250 else: 1250 else:
1251 notadded.append(addlayer) 1251 notadded.append(addlayer)
1252 del addlayers[:]
1252 1253
1253 if updated: 1254 if updated:
1254 return (bblayers, None, 2, False) 1255 return (bblayers, None, 2, False)