summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2017-08-17 15:16:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-18 23:46:37 +0100
commit1f033e444289ca24da60503f74f4228a64b34d65 (patch)
tree783a539b13784fc0ed1fe9ec9dc5dc4adcd28e36 /meta/lib
parent0c733631d69973d24a950cbd5098d326572ce988 (diff)
downloadpoky-1f033e444289ca24da60503f74f4228a64b34d65.tar.gz
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. (From OE-Core rev: 5a59a6997f41e606d088e3e86812de56f72f543b) Signed-off-by: Andrej Valek <andrej.valek@siemens.com> Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/copy_buildsystem.py5
1 files changed, 5 insertions, 0 deletions
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):
71 layerdestpath = destdir 71 layerdestpath = destdir
72 if corebase == os.path.dirname(layer): 72 if corebase == os.path.dirname(layer):
73 layerdestpath += '/' + os.path.basename(corebase) 73 layerdestpath += '/' + os.path.basename(corebase)
74 else:
75 layer_relative = os.path.basename(corebase) + '/' + os.path.relpath(layer, corebase)
76 if os.path.dirname(layer_relative) != layernewname:
77 layerdestpath += '/' + os.path.dirname(layer_relative)
78
74 layerdestpath += '/' + layernewname 79 layerdestpath += '/' + layernewname
75 80
76 layer_relative = os.path.relpath(layerdestpath, 81 layer_relative = os.path.relpath(layerdestpath,