diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-17 23:13:37 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-18 09:31:12 +0000 |
commit | 02204c971190429f5efaabc8271c4db0b41baabd (patch) | |
tree | a830aa834abdcf4215df4fcb7b8b2b6e42672dad | |
parent | e6db878d217f369c48af9bd7628baf922a48636c (diff) | |
download | poky-02204c971190429f5efaabc8271c4db0b41baabd.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 master rev: ccad07f35fb7f959e24fd50d04c7d10dd5cf20d0)
(From OE-Core rev: 30d3f06fddea2d8f3537d3415c95d75a6487078c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 0358d14e9a..13abf33671 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -639,19 +639,12 @@ def setscene_depvalid(task, taskdependees, notneeded, d): | |||
639 | return x.endswith("-native") | 639 | return x.endswith("-native") |
640 | def isNativeCross(x): | 640 | def isNativeCross(x): |
641 | return x.endswith("-native") or x.endswith("-cross") or x.endswith("-cross-initial") | 641 | return x.endswith("-native") or x.endswith("-cross") or x.endswith("-cross-initial") |
642 | def isSafeDep(x): | 642 | |
643 | if x in ["quilt-native", "autoconf-native", "automake-native", "gnu-config-native", "libtool-native", "pkgconfig-native", "gcc-cross", "binutils-cross", "gcc-cross-initial"]: | ||
644 | return True | ||
645 | return False | ||
646 | def isPostInstDep(x): | 643 | def isPostInstDep(x): |
647 | if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-update-icon-cache-native"]: | 644 | if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-update-icon-cache-native"]: |
648 | return True | 645 | return True |
649 | return False | 646 | return False |
650 | 647 | ||
651 | # We can skip these "safe" dependencies since the aren't runtime dependencies, just build time | ||
652 | if isSafeDep(taskdependees[task][0]) and taskdependees[task][1] == "do_populate_sysroot": | ||
653 | return True | ||
654 | |||
655 | # We only need to trigger populate_lic through direct dependencies | 648 | # We only need to trigger populate_lic through direct dependencies |
656 | if taskdependees[task][1] == "do_populate_lic": | 649 | if taskdependees[task][1] == "do_populate_lic": |
657 | return True | 650 | return True |