diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-10 22:49:38 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-14 22:30:57 +0000 |
commit | 5003d147617eed64532f2d7f7d12689622f99723 (patch) | |
tree | 220532bbe36fba5825cdd57071c32a96418536b4 /meta | |
parent | 48aad516c24fe38b5d6c7c97350f1ff87084e0db (diff) | |
download | poky-5003d147617eed64532f2d7f7d12689622f99723.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sstate.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
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): | |||
895 | if taskdependees[task][1] == 'do_shared_workdir': | 895 | if taskdependees[task][1] == 'do_shared_workdir': |
896 | continue | 896 | continue |
897 | 897 | ||
898 | if taskdependees[dep][1] == "do_populate_lic": | ||
899 | continue | ||
900 | |||
898 | # This is due to the [depends] in useradd.bbclass complicating matters | 901 | # This is due to the [depends] in useradd.bbclass complicating matters |
899 | # The logic *is* reversed here due to the way hard setscene dependencies are injected | 902 | # The logic *is* reversed here due to the way hard setscene dependencies are injected |
900 | 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': | 903 | 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': |