mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
bitbake/cache.py: Expansion of variables in skipped recipes should not be attempted as they can trigger errors
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
6f454c10bc
commit
847b717862
|
@ -114,6 +114,15 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)):
|
||||||
if not pn in packages:
|
if not pn in packages:
|
||||||
packages.append(pn)
|
packages.append(pn)
|
||||||
|
|
||||||
|
skip = cls.getvar('__SKIPPED', metadata)
|
||||||
|
if skip:
|
||||||
|
return RecipeInfo(None, None, None, None, None,
|
||||||
|
None, None, None, None, None,
|
||||||
|
None, skip, None, None, None,
|
||||||
|
None, None, None, None, None,
|
||||||
|
None, None, None, None, None,
|
||||||
|
None, None)
|
||||||
|
|
||||||
return RecipeInfo(
|
return RecipeInfo(
|
||||||
tasks = tasks,
|
tasks = tasks,
|
||||||
basetaskhashes = cls.taskvar('BB_BASEHASH', tasks, metadata),
|
basetaskhashes = cls.taskvar('BB_BASEHASH', tasks, metadata),
|
||||||
|
@ -124,7 +133,7 @@ class RecipeInfo(namedtuple('RecipeInfo', recipe_fields)):
|
||||||
{'tasks': [], 'parents': {}},
|
{'tasks': [], 'parents': {}},
|
||||||
variants = cls.listvar('__VARIANTS', metadata) + [''],
|
variants = cls.listvar('__VARIANTS', metadata) + [''],
|
||||||
|
|
||||||
skipped = cls.getvar('__SKIPPED', metadata),
|
skipped = skip,
|
||||||
timestamp = bb.parse.cached_mtime(filename),
|
timestamp = bb.parse.cached_mtime(filename),
|
||||||
packages = cls.listvar('PACKAGES', metadata),
|
packages = cls.listvar('PACKAGES', metadata),
|
||||||
pn = pn,
|
pn = pn,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user