summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2018-05-22 13:25:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-08-15 21:46:24 +0100
commit6706bad52f9311ea79c534ee90014c3216992999 (patch)
tree37b99ed1bb324d7d850ff59710c467f3aca33deb
parent92c5131a2feae2036c71a36c18bb9175bb2856dc (diff)
downloadopenembedded-core-6706bad52f9311ea79c534ee90014c3216992999.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. Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass3
-rw-r--r--meta/conf/layer.conf5
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):
# base-passwd/shadow-sysroot don't need their dependencies
if taskdependees[dep][0].endswith(("base-passwd", "shadow-sysroot")):
continue
- # Nothing need depend on libc-initial/gcc-cross-initial
- if "-initial" in taskdependees[task][0]:
- 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 315fb936fa..a8bebe102c 100644
--- a/meta/conf/layer.conf
+++ b/meta/conf/layer.conf
@@ -78,5 +78,10 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
weston-init->kbd \
"
+# Nothing needs to depend on libc-initial/gcc-cross-initial
+SSTATE_EXCLUDEDEPS_SYSROOT += "\
+ .*->.*-initial.* \
+"
+
# We need to keep bitbake tools in PATH
PATH := "${@os.path.dirname(bb.utils.which(d.getVar('PATH'),'bitbake'))}:${HOSTTOOLS_DIR}"