[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6193/8267] bitbake: cookerdata: Add support for BBFILES_DYNAMIC

[Emmanuele Bassi <ebassi src gnome org>]

commit 337bea6573db8ca23ba634406d1047264bc024ed
Author: Patrick Ohly <patrick ohly intel com>
Date:   Wed Jun 7 11:03:18 2017 +0200

    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>

 bitbake/lib/bb/cookerdata.py |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py
index 722d860..aa96f54 100644
--- a/bitbake/lib/bb/cookerdata.py
+++ b/bitbake/lib/bb/cookerdata.py
@@ -346,6 +346,20 @@ class CookerDataBuilder(object):
             data.delVar('LAYERDIR_RE')
             data.delVar('LAYERDIR')
 
+            bbfiles_dynamic = (data.getVar('BBFILES_DYNAMIC') or "").split()
+            collections = (data.getVar('BBFILE_COLLECTIONS') or "").split()
+            invalid = []
+            for entry in bbfiles_dynamic:
+                parts = entry.split(":", 1)
+                if len(parts) != 2:
+                    invalid.append(entry)
+                    continue
+                l, f = parts
+                if l in collections:
+                    data.appendVar("BBFILES", " " + f)
+            if invalid:
+                bb.fatal("BBFILES_DYNAMIC entries must be of the form <collection name>:<filename pattern>, 
not:\n    %s" % "\n    ".join(invalid))
+
         if not data.getVar("BBPATH"):
             msg = "The BBPATH variable is not set"
             if not layerconf: