]> code.ossystems Code Review - openembedded-core.git/commitdiff
scripts/compatlayer: Add exclude of meta-world-pkgdata on get_signatures
authorAníbal Limón <anibal.limon@linux.intel.com>
Mon, 20 Mar 2017 21:38:00 +0000 (15:38 -0600)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 21 Mar 2017 22:43:04 +0000 (22:43 +0000)
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]

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/lib/compatlayer/__init__.py

index a7eb86253109b6c49c3344e6c36456d81b1c6a07..888d303996a73ea7f28dd49a055f55573680cd03 100644 (file)
@@ -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: