summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-22 21:39:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-24 15:12:28 +0000
commit4fbcd2403f7a9e4818c731ab73ff7b37d46b4877 (patch)
tree95526fca8084cc1375aa2db159bad8e7c31222ad /meta/classes
parent4b45039be4d1808e369f9cd22f332c6e3c540f1c (diff)
downloadpoky-4fbcd2403f7a9e4818c731ab73ff7b37d46b4877.tar.gz
sstate: Explicitly define populate_sysroot task relationships
Clean up and clarify the populate_sysroot task dependencies. Target sysroot packages do need their dependencies installed, as do some target/cross relationships. We can whitelist the *-initial dependencies as these are never needed indirectly. (From OE-Core rev: eeec307917234d97be2674beeadef71599fb1487) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sstate.bbclass25
1 files changed, 16 insertions, 9 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index b8a766b7d3..e1bc89d05e 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -633,7 +633,7 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
633 def isNativeCross(x): 633 def isNativeCross(x):
634 return x.endswith("-native") or x.endswith("-cross") or x.endswith("-cross-initial") 634 return x.endswith("-native") or x.endswith("-cross") or x.endswith("-cross-initial")
635 def isSafeDep(x): 635 def isSafeDep(x):
636 if x in ["quilt-native", "autoconf-native", "automake-native", "gnu-config-native", "libtool-native", "pkgconfig-native", "gcc-cross", "binutils-cross"]: 636 if x in ["quilt-native", "autoconf-native", "automake-native", "gnu-config-native", "libtool-native", "pkgconfig-native", "gcc-cross", "binutils-cross", "gcc-cross-initial"]:
637 return True 637 return True
638 return False 638 return False
639 639
@@ -660,16 +660,23 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
660 # Native/Cross packages don't exist and are noexec anyway 660 # Native/Cross packages don't exist and are noexec anyway
661 if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: 661 if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']:
662 continue 662 continue
663 # Native/Cross populate_sysroot need their dependencies
664 if isNativeCross(taskdependees[task][0]) and isNativeCross(taskdependees[dep][0]) and taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot':
665 return False
666 # Target populate_sysroot depended on by cross tools need to be installed
667 if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot' and isNativeCross(taskdependees[dep][0]):
668 return False
669 663
670 # Target populate_sysroot do not need their dependencies 664 # Consider sysroot depending on sysroot tasks
671 if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot': 665 if taskdependees[task][1] == 'do_populate_sysroot' and taskdependees[dep][1] == 'do_populate_sysroot':
672 continue 666 # Nothing need depend on libc-initial/gcc-cross-initial
667 if taskdependees[task][0].endswith("-initial"):
668 continue
669 # Native/Cross populate_sysroot need their dependencies
670 if isNativeCross(taskdependees[task][0]) and isNativeCross(taskdependees[dep][0]):
671 return False
672 # Target populate_sysroot depended on by cross tools need to be installed
673 if isNativeCross(taskdependees[dep][0]):
674 return False
675 # Native/cross tools depended upon by target sysroot are not needed
676 if isNativeCross(taskdependees[task][0]):
677 continue
678 # Target populate_sysroot need their dependencies
679 return False
673 680
674 # Safe fallthrough default 681 # Safe fallthrough default
675 bb.debug(2, " Default setscene dependency fall through due to dependency: %s" % (str(taskdependees[dep]))) 682 bb.debug(2, " Default setscene dependency fall through due to dependency: %s" % (str(taskdependees[dep])))