[oe-commits] [openembedded-core] 07/11: oe/copy_buildsystem.py: make sure layer exists

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 5615a8c09eea2655762f623e565c1d2f75dda2ba
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Mon Oct 16 03:51:24 2017 +0800

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/copy_buildsystem.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index ac2fae1..4b94806 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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.