summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-11-12 15:24:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-12 08:42:28 +0000
commit8879571d116484eaaf3e01cbb9dd2bc4bb618476 (patch)
tree50e2fdaab37d8189d5f7faf362d6e11a810941b3 /meta
parenteeda3c66a2ca0f6da4572822112ef981d16461c2 (diff)
downloadpoky-8879571d116484eaaf3e01cbb9dd2bc4bb618476.tar.gz
classes/populate_sdk_ext: tweak reporting of workspace exclusion
If you have a local workspace layer enabled when building the extensible SDK, we explicitly exclude that from the SDK (mostly because the SDK has its own for the user to use). Adjust the message we print notifying the user of this so it's clear that we're excluding it from the SDK, and scale it back from a warning to a note printed with bb.plain(). (From OE-Core master rev: 90f46f74a088a7b965d2205eceb9eff6f276dd38) (From OE-Core rev: dbacd35c0db2e9f4b9b2a20ffa6bcc5f78432d8a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
-rw-r--r--meta/lib/oe/copy_buildsystem.py5
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 979578c41d..c0e7541c02 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
16class BuildSystem(object): 16class 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