[oe-commits] Richard Purdie : sstate: Add optimisation for useradd injected dependencies
git at git.openembedded.org
git at git.openembedded.org
Wed Jan 23 16:24:34 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 7bccc861c8536869dc1aca7d673534542598f368
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7bccc861c8536869dc1aca7d673534542598f368
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Wed Jan 23 14:28:31 2013 +0000
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/sstate.bbclass | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index bc9f7ad..edddd2f 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -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
More information about the Openembedded-commits
mailing list