mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
sstate: Add optimisation for useradd injected dependencies
useradd.bbclass adds sstate dependencies on base-passwd, shadow-native and shadow-sysroot. Due to the way these are injected, they interact badly with the other dependency validation logic and end up pulling in dependencies we don't actually need. This patch adds code to optimise those cases out. (From OE-Core rev: 784ca68fcca4ffb34390d55d9343570cfdf0305f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -666,6 +666,9 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
|
||||
|
||||
# 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
|
||||
# Nothing need depend on libc-initial/gcc-cross-initial
|
||||
if taskdependees[task][0].endswith("-initial"):
|
||||
continue
|
||||
@@ -681,6 +684,11 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
|
||||
# Target populate_sysroot need their dependencies
|
||||
return False
|
||||
|
||||
# This is due to the [depends] in useradd.bbclass complicating matters
|
||||
# The logic *is* reversed here due to the way hard setscene dependencies are injected
|
||||
if taskdependees[task][1] == 'do_package' and taskdependees[dep][0].endswith(('shadow-native', 'shadow-sysroot', 'base-passwd')) and taskdependees[dep][1] == 'do_populate_sysroot':
|
||||
continue
|
||||
|
||||
# Safe fallthrough default
|
||||
bb.debug(2, " Default setscene dependency fall through due to dependency: %s" % (str(taskdependees[dep])))
|
||||
return False
|
||||
|
||||
Reference in New Issue
Block a user