From: Robert Yang Date: Sun, 15 Oct 2017 19:51:24 +0000 (+0800) Subject: oe/copy_buildsystem.py: make sure layer exists X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~19166 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2eaefa0c3ae589111266c7d6822428ad910415f4;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index ac2fae1ed1e..4b94806c73f 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)