[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7276/8267] copy_buildsystem: include layer tree during build structure creation

[Emmanuele Bassi <ebassi src gnome org>]

commit 1f033e444289ca24da60503f74f4228a64b34d65
Author: Andrej Valek <andrej valek siemens com>
Date:   Thu Aug 17 15:16:01 2017 +0200

    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>

 meta/lib/oe/copy_buildsystem.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index dd506a3..e24488d 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,