diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2015-09-24 16:02:23 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-29 14:11:38 +0100 |
commit | 226e7da26e594dbefc5ecc0731ace7117d402cfa (patch) | |
tree | eaf4c1ec3fd2133371a1db51397976828c1b7668 /bitbake/lib/bb/utils.py | |
parent | d48b7ef607372488c1bf50762e4ca21773bf1e9a (diff) | |
download | openembedded-core-contrib-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/utils.py')
-rw-r--r-- | bitbake/lib/bb/utils.py | 1 |
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): bblayers.append(addlayer) else: notadded.append(addlayer) + del addlayers[:] if updated: return (bblayers, None, 2, False) |