diff options
| author | Aníbal Limón <anibal.limon@linux.intel.com> | 2017-03-20 15:38:00 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-22 11:35:22 +0000 |
| commit | 6786f662cd4a081c041f352118cd0d43e39f8270 (patch) | |
| tree | ecf61d5253c482deaf7770d304c84f034d13169a /scripts/lib/compatlayer | |
| parent | 07dd071bf667d5f0a729ec8f5e0d6a117d70596c (diff) | |
| download | poky-6786f662cd4a081c041f352118cd0d43e39f8270.tar.gz | |
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>
Diffstat (limited to 'scripts/lib/compatlayer')
| -rw-r--r-- | 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 a7eb862531..888d303996 100644 --- a/scripts/lib/compatlayer/__init__.py +++ b/scripts/lib/compatlayer/__init__.py | |||
| @@ -133,6 +133,11 @@ def get_signatures(builddir, failsafe=False): | |||
| 133 | import subprocess | 133 | import subprocess |
| 134 | import re | 134 | import re |
| 135 | 135 | ||
| 136 | # some recipes needs to be excluded like meta-world-pkgdata | ||
| 137 | # because a layer can add recipes to a world build so signature | ||
| 138 | # will be change | ||
| 139 | exclude_recipes = ('meta-world-pkgdata',) | ||
| 140 | |||
| 136 | sigs = {} | 141 | sigs = {} |
| 137 | 142 | ||
| 138 | cmd = 'bitbake ' | 143 | cmd = 'bitbake ' |
| @@ -153,6 +158,15 @@ def get_signatures(builddir, failsafe=False): | |||
| 153 | line = line.strip() | 158 | line = line.strip() |
| 154 | s = sig_regex.match(line) | 159 | s = sig_regex.match(line) |
| 155 | if s: | 160 | if s: |
| 161 | exclude = False | ||
| 162 | for er in exclude_recipes: | ||
| 163 | (recipe, task) = s.group('task').split(':') | ||
| 164 | if er == recipe: | ||
| 165 | exclude = True | ||
| 166 | break | ||
| 167 | if exclude: | ||
| 168 | continue | ||
| 169 | |||
| 156 | sigs[s.group('task')] = s.group('hash') | 170 | sigs[s.group('task')] = s.group('hash') |
| 157 | 171 | ||
| 158 | if not sigs: | 172 | if not sigs: |
