From 5003d147617eed64532f2d7f7d12689622f99723 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 10 Dec 2015 22:49:38 +0000 Subject: sstate: Ensure populate_lic dependencies are not followed It was observed that do_fetch dependencies (e.g. subversion-native of tremor) were being installed even when sstate was available and hence no fetch was needed. This turned out to be due to the recursive nature of the rootfs dependencies which include populate_lic. We can explicitly whitelist these dependencies as being ones we don't need to follow when installing sstate (the code defaults to being paranoid). [YOCTO #8746] (From OE-Core rev: 06c891f0fa6c7712eae233dd18612f1ab1889c45) Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/classes') diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 43c3e7e2e6..9bef212521 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -895,6 +895,9 @@ def setscene_depvalid(task, taskdependees, notneeded, d): if taskdependees[task][1] == 'do_shared_workdir': continue + if taskdependees[dep][1] == "do_populate_lic": + continue + # 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', 'pseudo-native')) and taskdependees[dep][1] == 'do_populate_sysroot': -- cgit v1.2.3-54-g00ecf