summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/copy_buildsystem.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index 5b96121ddb..246ff58250 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py
@@ -45,6 +45,9 @@ class BuildSystem(object):
45 45
46 corebase = os.path.abspath(self.d.getVar('COREBASE')) 46 corebase = os.path.abspath(self.d.getVar('COREBASE'))
47 layers.append(corebase) 47 layers.append(corebase)
48 # Get relationship between TOPDIR and COREBASE
49 # Layers should respect it
50 corebase_relative = os.path.dirname(os.path.relpath(os.path.abspath(self.d.getVar('TOPDIR')), corebase))
48 # The bitbake build system uses the meta-skeleton layer as a layout 51 # The bitbake build system uses the meta-skeleton layer as a layout
49 # for common recipies, e.g: the recipetool script to create kernel recipies 52 # for common recipies, e.g: the recipetool script to create kernel recipies
50 # Add the meta-skeleton layer to be included as part of the eSDK installation 53 # Add the meta-skeleton layer to be included as part of the eSDK installation
@@ -98,7 +101,10 @@ class BuildSystem(object):
98 if corebase == os.path.dirname(layer): 101 if corebase == os.path.dirname(layer):
99 layerdestpath += '/' + os.path.basename(corebase) 102 layerdestpath += '/' + os.path.basename(corebase)
100 else: 103 else:
101 layer_relative = os.path.basename(corebase) + '/' + os.path.relpath(layer, corebase) 104 layer_relative = os.path.relpath(layer, corebase)
105 if os.path.dirname(layer_relative) == corebase_relative:
106 layer_relative = os.path.dirname(corebase_relative) + '/' + layernewname
107 layer_relative = os.path.basename(corebase) + '/' + layer_relative
102 if os.path.dirname(layer_relative) != layernewname: 108 if os.path.dirname(layer_relative) != layernewname:
103 layerdestpath += '/' + os.path.dirname(layer_relative) 109 layerdestpath += '/' + os.path.dirname(layer_relative)
104 110