summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sstate.bbclass3
-rw-r--r--meta/conf/layer.conf2
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):
975 975
976 # Consider sysroot depending on sysroot tasks 976 # Consider sysroot depending on sysroot tasks
977 if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot': 977 if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot':
978 # base-passwd/shadow-sysroot don't need their dependencies
979 if taskdependees[dep][0].endswith(("base-passwd", "shadow-sysroot")):
980 continue
981 # Allow excluding certain recursive dependencies. If a recipe needs it should add a 978 # Allow excluding certain recursive dependencies. If a recipe needs it should add a
982 # specific dependency itself, rather than relying on one of its dependees to pull 979 # specific dependency itself, rather than relying on one of its dependees to pull
983 # them in. 980 # 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 += " \
79" 79"
80 80
81# Nothing needs to depend on libc-initial/gcc-cross-initial 81# Nothing needs to depend on libc-initial/gcc-cross-initial
82# base-passwd/shadow-sysroot don't need their dependencies
82SSTATE_EXCLUDEDEPS_SYSROOT += "\ 83SSTATE_EXCLUDEDEPS_SYSROOT += "\
83 .*->.*-initial.* \ 84 .*->.*-initial.* \
85 .*(base-passwd|shadow-sysroot)->.* \
84" 86"
85 87
86# We need to keep bitbake tools in PATH 88# We need to keep bitbake tools in PATH