From 5a59a6997f41e606d088e3e86812de56f72f543b Mon Sep 17 00:00:00 2001 From: Andrej Valek Date: Thu, 17 Aug 2017 15:16:01 +0200 Subject: copy_buildsystem: include layer tree during build structure creation When buildsystem with layer structure is going to be copied, only the last meta-XXX layer is taken. For example, during ext_sdk bblayers creating: layers/oe/meta \ layers/oe/meta-oe \ layers/oe/meta-networking \ layers/oe/meta-webserver \ ... It restructured meta-oe, meta-networking,... contents into meta-oe. Recipes from meta-oe will be on the same level like meta-networking, meta-webserver, ... . It should take the whole meta path instead of the last one. layers/oe/meta \ layers/oe/meta-oe/meta-oe \ layers/oe/meta-oe/meta-networking \ layers/oe/meta-oe/meta-webserver \ ... Now the directory structure is the same like during build creation. Signed-off-by: Andrej Valek Signed-off-by: Pascal Bach Signed-off-by: Richard Purdie --- meta/lib/oe/copy_buildsystem.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta') diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index dd506a39e6..e24488db10 100644 --- a/meta/lib/oe/copy_buildsystem.py +++ b/meta/lib/oe/copy_buildsystem.py @@ -71,6 +71,11 @@ class BuildSystem(object): layerdestpath = destdir if corebase == os.path.dirname(layer): layerdestpath += '/' + os.path.basename(corebase) + else: + layer_relative = os.path.basename(corebase) + '/' + os.path.relpath(layer, corebase) + if os.path.dirname(layer_relative) != layernewname: + layerdestpath += '/' + os.path.dirname(layer_relative) + layerdestpath += '/' + layernewname layer_relative = os.path.relpath(layerdestpath, -- cgit 1.2.3-korg