summaryrefslogtreecommitdiffstats
path: root/meta/lib
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>2015-12-01 21:32:00 +0000
commit29481692919da42a424c7a971b2669174134ad96 (patch)
treebdc240b0eb152d3c20c83e9d92618260c82f9255 /meta/lib
parent28a2ea701c97bd2d68a211af3aedb4d70ae7852c (diff)
downloadpoky-29481692919da42a424c7a971b2669174134ad96.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 rev: 90f46f74a088a7b965d2205eceb9eff6f276dd38) 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/lib')
-rw-r--r--meta/lib/oe/copy_buildsystem.py5
1 files changed, 3 insertions, 2 deletions
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
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