From 226e7da26e594dbefc5ecc0731ace7117d402cfa Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Thu, 24 Sep 2015 16:02:23 +0300 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/utils.py | 1 + 1 file changed, 1 insertion(+) (limited to 'bitbake') 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): bblayers.append(addlayer) else: notadded.append(addlayer) + del addlayers[:] if updated: return (bblayers, None, 2, False) -- cgit v1.2.3-54-g00ecf