summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-24 15:10:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-25 08:01:09 +0000
commite4ef6bbc21949957d9009757fe24ffd57bcd83b9 (patch)
tree495462e0a00d7e4fa6a6a8fb966c654a7ad20a18
parent458496829bb3c9d63fde3aecde5a5e84762fb994 (diff)
downloadpoky-e4ef6bbc21949957d9009757fe24ffd57bcd83b9.tar.gz
poky-e4ef6bbc21949957d9009757fe24ffd57bcd83b9.tar.bz2
poky-e4ef6bbc21949957d9009757fe24ffd57bcd83b9.zip
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>
-rw-r--r--meta/classes/sstate.bbclass9
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):
def isNativeCross(x):
return x.endswith("-native") or x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-crosssdk") or x.endswith("-crosssdk-initial")
- def isSafeDep(x):
- 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"]:
- return True
- return False
+
def isPostInstDep(x):
if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-update-icon-cache-native"]:
return True
return False
- # We can skip these "safe" dependencies since the aren't runtime dependencies, just build time
- if isSafeDep(taskdependees[task][0]) and taskdependees[task][1] == "do_populate_sysroot":
- return True
-
# We only need to trigger populate_lic through direct dependencies
if taskdependees[task][1] == "do_populate_lic":
return True