diff options
author | André Draszik <andre.draszik@jci.com> | 2018-05-22 13:25:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-16 09:49:39 +0100 |
commit | e02176b5e66721c8d872c93d2108e98d142c376b (patch) | |
tree | 2a01c1a8a9d7604655d543be22be58ca1fbe0bac | |
parent | 7b7aa56548d61a85b928b90d2e7a3c9b3fee4a6b (diff) | |
download | poky-e02176b5e66721c8d872c93d2108e98d142c376b.tar.gz |
sstate: use SSTATE_EXCLUDEDEPS_SYSROOT for skipping *-initial recipes
Use the newly introduced SSTATE_EXCLUDEDEPS_SYSROOT for specifying
the *-initial recipes to be excluded from a recipe sysroot.
(From OE-Core rev: 6706bad52f9311ea79c534ee90014c3216992999)
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 | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 53f71d4337..f1a289143b 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -978,9 +978,6 @@ def setscene_depvalid(task, taskdependees, notneeded, d, log=None): | |||
978 | # base-passwd/shadow-sysroot don't need their dependencies | 978 | # base-passwd/shadow-sysroot don't need their dependencies |
979 | if taskdependees[dep][0].endswith(("base-passwd", "shadow-sysroot")): | 979 | if taskdependees[dep][0].endswith(("base-passwd", "shadow-sysroot")): |
980 | continue | 980 | continue |
981 | # Nothing need depend on libc-initial/gcc-cross-initial | ||
982 | if "-initial" in taskdependees[task][0]: | ||
983 | continue | ||
984 | # Allow excluding certain recursive dependencies. If a recipe needs it should add a | 981 | # Allow excluding certain recursive dependencies. If a recipe needs it should add a |
985 | # specific dependency itself, rather than relying on one of its dependees to pull | 982 | # specific dependency itself, rather than relying on one of its dependees to pull |
986 | # them in. | 983 | # them in. |
diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 315fb936fa..a8bebe102c 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf | |||
@@ -78,5 +78,10 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ | |||
78 | weston-init->kbd \ | 78 | weston-init->kbd \ |
79 | " | 79 | " |
80 | 80 | ||
81 | # Nothing needs to depend on libc-initial/gcc-cross-initial | ||
82 | SSTATE_EXCLUDEDEPS_SYSROOT += "\ | ||
83 | .*->.*-initial.* \ | ||
84 | " | ||
85 | |||
81 | # We need to keep bitbake tools in PATH | 86 | # We need to keep bitbake tools in PATH |
82 | PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" | 87 | PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}" |