diff options
| author | André Draszik <andre.draszik@jci.com> | 2018-05-22 13:25:52 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-15 21:46:24 +0100 |
| commit | 68e502e9063a88532fe0154f152ba408f0091900 (patch) | |
| tree | 06e6127de0ef234b19a665aeda1c31e9f6449d33 | |
| parent | 6706bad52f9311ea79c534ee90014c3216992999 (diff) | |
| download | openembedded-core-68e502e9063a88532fe0154f152ba408f0091900.tar.gz openembedded-core-68e502e9063a88532fe0154f152ba408f0091900.tar.bz2 openembedded-core-68e502e9063a88532fe0154f152ba408f0091900.zip | |
sstate: use SSTATE_EXCLUDEDEPS_SYSROOT for skipping base-passwd|shadow-sysroot recipes
Use the newly introduced SSTATE_EXCLUDEDEPS_SYSROOT for specifying
the base-passwd|shadow-sysroot recipes to be excluded from a recipe sysroot.
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/sstate.bbclass | 3 | ||||
| -rw-r--r-- | meta/conf/layer.conf | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index f1a289143b..6f2fa583f2 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -975,9 +975,6 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): # Consider sysroot depending on sysroot tasks if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot': - # base-passwd/shadow-sysroot don't need their dependencies - if taskdependees[dep][0].endswith(("base-passwd", "shadow-sysroot")): - continue # Allow excluding certain recursive dependencies. If a recipe needs it should add a # specific dependency itself, rather than relying on one of its dependees to pull # them in. diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index a8bebe102c..0a8f8ed9eb 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -79,8 +79,10 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ " # Nothing needs to depend on libc-initial/gcc-cross-initial +# base-passwd/shadow-sysroot don't need their dependencies SSTATE_EXCLUDEDEPS_SYSROOT += "\ .*->.*-initial.* \ + .*(base-passwd|shadow-sysroot)->.* \ " # We need to keep bitbake tools in PATH |