summaryrefslogtreecommitdiffstats
path: root/meta
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:39 +0100
commit04dc76713b57f28457742dd863caa663591d4866 (patch)
tree83f3e41674aedd3deb8327fd5c8eb687ecb630c2 /meta
parent769c774f899711b6f1626600371f6ff072b19dc1 (diff)
downloadpoky-04dc76713b57f28457742dd863caa663591d4866.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] (From OE-Core rev: 5c9ef0734d23909b5694ed43cdbb205c2ba9ca95) Signed-off-by: Juan M Cruz Alcaraz <juan.m.cruz.alcaraz@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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):
32 32
33 corebase = os.path.abspath(self.d.getVar('COREBASE')) 33 corebase = os.path.abspath(self.d.getVar('COREBASE'))
34 layers.append(corebase) 34 layers.append(corebase)
35 # The bitbake build system uses the meta-skeleton layer as a layout
36 # for common recipies, e.g: the recipetool script to create kernel recipies
37 # Add the meta-skeleton layer to be included as part of the eSDK installation
38 layers.append(os.path.join(corebase, 'meta-skeleton'))
35 39
36 # Exclude layers 40 # Exclude layers
37 for layer_exclude in self.layers_exclude: 41 for layer_exclude in self.layers_exclude:
@@ -128,6 +132,14 @@ class BuildSystem(object):
128 line = line.replace('workspacelayer', workspace_newname) 132 line = line.replace('workspacelayer', workspace_newname)
129 f.write(line) 133 f.write(line)
130 134
135 # meta-skeleton layer is added as part of the build system
136 # but not as a layer included in the build, therefore it is
137 # not reported to the function caller.
138 for layer in layers_copied:
139 if layer.endswith('/meta-skeleton'):
140 layers_copied.remove(layer)
141 break
142
131 return layers_copied 143 return layers_copied
132 144
133def generate_locked_sigs(sigfile, d): 145def generate_locked_sigs(sigfile, d):