diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-10-16 03:51:24 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-01-06 22:32:22 +0000 |
commit | 4885cdc0002abbd30d11ccad0c55c9a9071f0ac4 (patch) | |
tree | e2007d57fbb3300bb018941e2431c86e7a6bf338 /meta/lib/oe/copy_buildsystem.py | |
parent | eaad759ac8a432ac41f72ff3bef8d31abfa18dfa (diff) | |
download | poky-4885cdc0002abbd30d11ccad0c55c9a9071f0ac4.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.
(From OE-Core rev: 2eaefa0c3ae589111266c7d6822428ad910415f4)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/copy_buildsystem.py')
-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): | |||
95 | destname = os.path.join(layerdestpath, f_basename) | 95 | destname = os.path.join(layerdestpath, f_basename) |
96 | _smart_copy(f, destname) | 96 | _smart_copy(f, destname) |
97 | else: | 97 | else: |
98 | if os.path.exists(layerdestpath): | 98 | if os.path.exists(os.path.join(layerdestpath, 'conf/layer.conf')): |
99 | bb.note("Skipping layer %s, already handled" % layer) | 99 | bb.note("Skipping layer %s, already handled" % layer) |
100 | else: | 100 | else: |
101 | _smart_copy(layer, layerdestpath) | 101 | _smart_copy(layer, layerdestpath) |