diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-10-16 03:51:24 +0800 |
---|---|---|
committer | Robert Yang <liezhi.yang@windriver.com> | 2017-11-22 11:02:15 +0800 |
commit | 8e3758ce5b4a60e3b2977f74803c9f20d81777c7 (patch) | |
tree | 8b98a9af5ba86d0dd48888af58def3617d94e127 | |
parent | 1dc15549f49d548923960ad388572a44080c7dd8 (diff) | |
download | openembedded-core-contrib-8e3758ce5b4a60e3b2977f74803c9f20d81777c7.tar.gz |
oe/copy_buildsystem.py: make sure layer exists
It had a problem when nested layer before, e.g.:
layer_a/layer_b/
And when layer_b is handled before layer_a, then layer_a dir existed, so
it would be treated as already handled, which was wrong, check
conf/layer.conf can fix the problem.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r-- | meta/lib/oe/copy_buildsystem.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index ac2fae1ed1..4b94806c73 100644 --- a/meta/lib/oe/copy_buildsystem.py +++ b/meta/lib/oe/copy_buildsystem.py @@ -95,7 +95,7 @@ class BuildSystem(object): destname = os.path.join(layerdestpath, f_basename) _smart_copy(f, destname) else: - if os.path.exists(layerdestpath): + if os.path.exists(os.path.join(layerdestpath, 'conf/layer.conf')): bb.note("Skipping layer %s, already handled" % layer) else: _smart_copy(layer, layerdestpath) |