summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-10-16 03:51:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-06 10:13:39 +0000
commit2eaefa0c3ae589111266c7d6822428ad910415f4 (patch)
tree6ed6596b8450f44e22e6de66e94a45d6422824d9
parent32126512349d65f0dbc31196c4ec6e1a1147cf5e (diff)
downloadopenembedded-core-contrib-2eaefa0c3ae589111266c7d6822428ad910415f4.tar.gz
openembedded-core-contrib-2eaefa0c3ae589111266c7d6822428ad910415f4.tar.bz2
openembedded-core-contrib-2eaefa0c3ae589111266c7d6822428ad910415f4.zip
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/copy_buildsystem.py2
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)