aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan M Cruz Alcaraz <juan.m.cruz.alcaraz@linux.intel.com>2017-08-18 17:29:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-19 22:15:25 +0100
commit5c9ef0734d23909b5694ed43cdbb205c2ba9ca95 (patch)
tree58024bd5d0fe28d4be060f017bb203e6a6be860d
parenta30f8f60017d566d845ee5d3a8cfc338017211b0 (diff)
downloadopenembedded-core-contrib-5c9ef0734d23909b5694ed43cdbb205c2ba9ca95.tar.gz
devtool/copy_buildsystem: adds meta-skeleton layer in the eSDK installation.
The eSDK installation requires the meta-skeleton layer. The build system might use the meta-skeleton recipes as layout to create custom recipes. An example is the recipetool script that uses the meta-skeleton kernel recipe when creating a custom kernel recipe. [YOCTO #11102] Signed-off-by: Juan M Cruz Alcaraz <juan.m.cruz.alcaraz@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/copy_buildsystem.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py
index e24488db10..ac2fae1ed1 100644
--- a/meta/lib/oe/copy_buildsystem.py
+++ b/meta/lib/oe/copy_buildsystem.py
@@ -32,6 +32,10 @@ class BuildSystem(object):
corebase = os.path.abspath(self.d.getVar('COREBASE'))
layers.append(corebase)
+ # The bitbake build system uses the meta-skeleton layer as a layout
+ # 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
+ layers.append(os.path.join(corebase, 'meta-skeleton'))
# Exclude layers
for layer_exclude in self.layers_exclude:
@@ -128,6 +132,14 @@ class BuildSystem(object):
line = line.replace('workspacelayer', workspace_newname)
f.write(line)
+ # meta-skeleton layer is added as part of the build system
+ # but not as a layer included in the build, therefore it is
+ # not reported to the function caller.
+ for layer in layers_copied:
+ if layer.endswith('/meta-skeleton'):
+ layers_copied.remove(layer)
+ break
+
return layers_copied
def generate_locked_sigs(sigfile, d):