diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 2 | ||||
-rw-r--r-- | meta/lib/oe/copy_buildsystem.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index e806d32a54..736f17f489 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -51,7 +51,7 @@ python copy_buildsystem () { | |||
51 | core_meta_subdir = '' | 51 | core_meta_subdir = '' |
52 | 52 | ||
53 | # Copy in all metadata layers + bitbake (as repositories) | 53 | # Copy in all metadata layers + bitbake (as repositories) |
54 | buildsystem = oe.copy_buildsystem.BuildSystem(d) | 54 | buildsystem = oe.copy_buildsystem.BuildSystem('extensible SDK', d) |
55 | baseoutpath = d.getVar('SDK_OUTPUT', True) + '/' + d.getVar('SDKPATH', True) | 55 | baseoutpath = d.getVar('SDK_OUTPUT', True) + '/' + d.getVar('SDKPATH', True) |
56 | layers_copied = buildsystem.copy_bitbake_and_layers(baseoutpath + '/layers') | 56 | layers_copied = buildsystem.copy_bitbake_and_layers(baseoutpath + '/layers') |
57 | 57 | ||
diff --git a/meta/lib/oe/copy_buildsystem.py b/meta/lib/oe/copy_buildsystem.py index 23166f96a8..15af4eb84b 100644 --- a/meta/lib/oe/copy_buildsystem.py +++ b/meta/lib/oe/copy_buildsystem.py | |||
@@ -14,8 +14,9 @@ def _smart_copy(src, dest): | |||
14 | shutil.copymode(src, dest) | 14 | shutil.copymode(src, dest) |
15 | 15 | ||
16 | class BuildSystem(object): | 16 | class BuildSystem(object): |
17 | def __init__(self, d): | 17 | def __init__(self, context, d): |
18 | self.d = d | 18 | self.d = d |
19 | self.context = context | ||
19 | self.layerdirs = d.getVar('BBLAYERS', True).split() | 20 | self.layerdirs = d.getVar('BBLAYERS', True).split() |
20 | 21 | ||
21 | def copy_bitbake_and_layers(self, destdir): | 22 | def copy_bitbake_and_layers(self, destdir): |
@@ -38,7 +39,7 @@ class BuildSystem(object): | |||
38 | if os.path.exists(layerconf): | 39 | if os.path.exists(layerconf): |
39 | with open(layerconf, 'r') as f: | 40 | with open(layerconf, 'r') as f: |
40 | if f.readline().startswith("# ### workspace layer auto-generated by devtool ###"): | 41 | if f.readline().startswith("# ### workspace layer auto-generated by devtool ###"): |
41 | bb.warn("Skipping local workspace layer %s" % layer) | 42 | bb.plain("NOTE: Excluding local workspace layer %s from %s" % (layer, self.context)) |
42 | continue | 43 | continue |
43 | 44 | ||
44 | # If the layer was already under corebase, leave it there | 45 | # If the layer was already under corebase, leave it there |