summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cookerdata.py
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2017-06-07 11:03:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-09 17:13:45 +0100
commit337bea6573db8ca23ba634406d1047264bc024ed (patch)
tree55649d0b200ec443f8c814990468c0625fb25c4d /bitbake/lib/bb/cookerdata.py
parente9a6fd9e9779757773a172475d9725823dd3d5ff (diff)
downloadpoky-337bea6573db8ca23ba634406d1047264bc024ed.tar.gz
bitbake: cookerdata: Add support for BBFILES_DYNAMIC
BBFILES_DYNAMIC can be used to activate content only when some other layers are present. The other layers are identified by the collections that they define. The main use case is to avoid .bbappends without the corresponding .bb file in layers that want to modify other layers via .bbappends without introducing a hard dependency on those other layers. .bb files could also be handled via BBFILES_DYNAMIC. Entries in BBFILES_DYNAMIC must have the form <collection name>:<filename pattern>. Example usage: BBFILES_DYNAMIC += " \ clang-layer:${LAYERDIR}/bbappends/meta-clang/*/*/*.bbappend \ core:${LAYERDIR}/bbappends/openembedded-core/meta/*/*/*.bbappend \ " Parsing is aborted when invalid entries are found with an error message like this: ERROR: BBFILES_DYNAMIC entries must be of the form <collection name>:<filename pattern>, not: /work/my-layer/bbappends/meta-security-isafw/*/*/*.bbappend /work/my-layer/bbappends/openembedded-core/meta/*/*/*.bbappend Based on a patch by Richard Purdie. (Bitbake rev: 04f8bd50aa04b12cf91dd6a3154527ad2c24695c) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cookerdata.py')
-rw-r--r--bitbake/lib/bb/cookerdata.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 722d860246..aa96f54e54 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -346,6 +346,20 @@ class CookerDataBuilder(object):
346 data.delVar('LAYERDIR_RE') 346 data.delVar('LAYERDIR_RE')
347 data.delVar('LAYERDIR') 347 data.delVar('LAYERDIR')
348 348
349 bbfiles_dynamic = (data.getVar('BBFILES_DYNAMIC') or "").split()
350 collections = (data.getVar('BBFILE_COLLECTIONS') or "").split()
351 invalid = []
352 for entry in bbfiles_dynamic:
353 parts = entry.split(":", 1)
354 if len(parts) != 2:
355 invalid.append(entry)
356 continue
357 l, f = parts
358 if l in collections:
359 data.appendVar("BBFILES", " " + f)
360 if invalid:
361 bb.fatal("BBFILES_DYNAMIC entries must be of the form <collection name>:<filename pattern>, not:\n %s" % "\n ".join(invalid))
362
349 if not data.getVar("BBPATH"): 363 if not data.getVar("BBPATH"):
350 msg = "The BBPATH variable is not set" 364 msg = "The BBPATH variable is not set"
351 if not layerconf: 365 if not layerconf: