[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5235/8267] scripts/compatlayer: Add exclude of meta-world-pkgdata on get_signatures



commit 6786f662cd4a081c041f352118cd0d43e39f8270
Author: Aníbal Limón <anibal limon linux intel com>
Date:   Mon Mar 20 15:38:00 2017 -0600

    scripts/compatlayer: Add exclude of meta-world-pkgdata on get_signatures
    
    The meta-world-pkgdata recipe can be modified when a layer is added
    may be can add recipes to world target, so exclude by default.
    
    [YOCTO #11162]
    
    (From OE-Core rev: cde30d70b04eb66bff66a351ddf733022e98ddab)
    
    Signed-off-by: Aníbal Limón <anibal limon linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/compatlayer/__init__.py |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/scripts/lib/compatlayer/__init__.py b/scripts/lib/compatlayer/__init__.py
index a7eb862..888d303 100644
--- a/scripts/lib/compatlayer/__init__.py
+++ b/scripts/lib/compatlayer/__init__.py
@@ -133,6 +133,11 @@ def get_signatures(builddir, failsafe=False):
     import subprocess
     import re
 
+    # some recipes needs to be excluded like meta-world-pkgdata
+    # because a layer can add recipes to a world build so signature
+    # will be change
+    exclude_recipes = ('meta-world-pkgdata',)
+
     sigs = {}
 
     cmd = 'bitbake '
@@ -153,6 +158,15 @@ def get_signatures(builddir, failsafe=False):
             line = line.strip()
             s = sig_regex.match(line)
             if s:
+                exclude = False
+                for er in exclude_recipes:
+                    (recipe, task) = s.group('task').split(':')
+                    if er == recipe:
+                        exclude = True
+                        break
+                if exclude:
+                    continue
+
                 sigs[s.group('task')] = s.group('hash')
 
     if not sigs:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]