diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-24 15:10:49 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-25 08:01:09 +0000 |
commit | e4ef6bbc21949957d9009757fe24ffd57bcd83b9 (patch) | |
tree | 495462e0a00d7e4fa6a6a8fb966c654a7ad20a18 /meta/classes/sstate.bbclass | |
parent | 458496829bb3c9d63fde3aecde5a5e84762fb994 (diff) | |
download | poky-e4ef6bbc21949957d9009757fe24ffd57bcd83b9.tar.gz |
sstate: Drop 'SafeDep' code from setscene validation function
I have a feeling this code exists from the time before we had proper
coverage of one sstate task by another task. At that time it was a
"poor" persons version of that idea, we now have much better
code internal to bitbake which handles this.
Worse, this code actually breaks certain rebuild scenarios,
e.g.:
bitbake libtool-cross
bitbake libtool-cross -c cleansstate
rm tmp -rf
bitbake libtool-cross
would fail as binutils-cross wasn't installed from sstate.
The easiest fix is to remove the obsolete/broken code.
[YOCTO #5773]
(From OE-Core rev: ccad07f35fb7f959e24fd50d04c7d10dd5cf20d0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r-- | meta/classes/sstate.bbclass | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index c4f437bde5..a45fe1eac2 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -702,19 +702,12 @@ def setscene_depvalid(task, taskdependees, notneeded, d): | |||
702 | 702 | ||
703 | def isNativeCross(x): | 703 | def isNativeCross(x): |
704 | return x.endswith("-native") or x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-crosssdk") or x.endswith("-crosssdk-initial") | 704 | return x.endswith("-native") or x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-crosssdk") or x.endswith("-crosssdk-initial") |
705 | def isSafeDep(x): | 705 | |
706 | if x in ["quilt-native", "autoconf-native", "automake-native", "gnu-config-native", "libtool-native", "pkgconfig-native", "gcc-cross", "binutils-cross", "gcc-cross-initial", "gcc-crosssdk", "binutils-crosssdk", "gcc-crosssdk-initial"]: | ||
707 | return True | ||
708 | return False | ||
709 | def isPostInstDep(x): | 706 | def isPostInstDep(x): |
710 | if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-update-icon-cache-native"]: | 707 | if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-update-icon-cache-native"]: |
711 | return True | 708 | return True |
712 | return False | 709 | return False |
713 | 710 | ||
714 | # We can skip these "safe" dependencies since the aren't runtime dependencies, just build time | ||
715 | if isSafeDep(taskdependees[task][0]) and taskdependees[task][1] == "do_populate_sysroot": | ||
716 | return True | ||
717 | |||
718 | # We only need to trigger populate_lic through direct dependencies | 711 | # We only need to trigger populate_lic through direct dependencies |
719 | if taskdependees[task][1] == "do_populate_lic": | 712 | if taskdependees[task][1] == "do_populate_lic": |
720 | return True | 713 | return True |