mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

oe/copy_buildsystem: move layer into layers directory

Browse Source 
Layers could be located outside from poky but inside the build directory.
This case should be covered in eSDK.
meta-abc
meta-def/meta-ghi
meta-def/poky
meta-def/meta-oe/meta-oe
...

It should take all enabled layers and put them into 'layers' dir during
build-time with respecting new relative path to poky.
layers/meta-abc
layers/meta-ghi
layers/poky
layers/meta-oe/meta-oe
...

(From OE-Core rev: 55ecf6988d3e3c0935cb6324a6ad2c75f1191a1d)

Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andrej Valek
2019-07-17 15:25:44 +02:00
committed by Richard Purdie
parent 9f6dcdaf96
commit c41acbcf8a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/copy_buildsystem.py
+7 -1
View File
@@ -45,6 +45,9 @@ class BuildSystem(object):
corebase = os.path.abspath(self.d.getVar('COREBASE')) corebase = os.path.abspath(self.d.getVar('COREBASE'))
layers.append(corebase) layers.append(corebase)
# Get relationship between TOPDIR and COREBASE
# Layers should respect it
corebase_relative = os.path.dirname(os.path.relpath(os.path.abspath(self.d.getVar('TOPDIR')), corebase))
# The bitbake build system uses the meta-skeleton layer as a layout # The bitbake build system uses the meta-skeleton layer as a layout
# for common recipies, e.g: the recipetool script to create kernel recipies # for common recipies, e.g: the recipetool script to create kernel recipies
# Add the meta-skeleton layer to be included as part of the eSDK installation # Add the meta-skeleton layer to be included as part of the eSDK installation
@@ -98,7 +101,10 @@ class BuildSystem(object):
if corebase == os.path.dirname(layer): if corebase == os.path.dirname(layer):
layerdestpath += '/' + os.path.basename(corebase) layerdestpath += '/' + os.path.basename(corebase)
else: else:
layer_relative = os.path.basename(corebase) + '/' + os.path.relpath(layer, corebase) layer_relative = os.path.relpath(layer, corebase)
if os.path.dirname(layer_relative) == corebase_relative:
layer_relative = os.path.dirname(corebase_relative) + '/' + layernewname
layer_relative = os.path.basename(corebase) + '/' + layer_relative
if os.path.dirname(layer_relative) != layernewname: if os.path.dirname(layer_relative) != layernewname:
layerdestpath += '/' + os.path.dirname(layer_relative) layerdestpath += '/' + os.path.dirname(layer_relative)