summaryrefslogtreecommitdiffstats
path: root/meta/classes/sstate.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r--meta/classes/sstate.bbclass16
1 files changed, 7 insertions, 9 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index b56e95a768..f1faf4848e 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -871,17 +871,14 @@ BB_SETSCENE_DEPVALID = "setscene_depvalid"
871def setscene_depvalid(task, taskdependees, notneeded, d): 871def setscene_depvalid(task, taskdependees, notneeded, d):
872 # taskdependees is a dict of tasks which depend on task, each being a 3 item list of [PN, TASKNAME, FILENAME] 872 # taskdependees is a dict of tasks which depend on task, each being a 3 item list of [PN, TASKNAME, FILENAME]
873 # task is included in taskdependees too 873 # task is included in taskdependees too
874 # Return - False - We need this dependency
875 # - True - We can skip this dependency
874 876
875 bb.debug(2, "Considering setscene task: %s" % (str(taskdependees[task]))) 877 bb.debug(2, "Considering setscene task: %s" % (str(taskdependees[task])))
876 878
877 def isNativeCross(x): 879 def isNativeCross(x):
878 return x.endswith("-native") or "-cross-" in x or "-crosssdk" in x 880 return x.endswith("-native") or "-cross-" in x or "-crosssdk" in x
879 881
880 def isPostInstDep(x):
881 if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-icon-utils-native", "ca-certificates-native"]:
882 return True
883 return False
884
885 # We only need to trigger populate_lic through direct dependencies 882 # We only need to trigger populate_lic through direct dependencies
886 if taskdependees[task][1] == "do_populate_lic": 883 if taskdependees[task][1] == "do_populate_lic":
887 return True 884 return True
@@ -903,10 +900,11 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
903 # do_package_write_* and do_package doesn't need do_package 900 # do_package_write_* and do_package doesn't need do_package
904 if taskdependees[task][1] == "do_package" and taskdependees[dep][1] in ['do_package', 'do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata', 'do_package_qa']: 901 if taskdependees[task][1] == "do_package" and taskdependees[dep][1] in ['do_package', 'do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata', 'do_package_qa']:
905 continue 902 continue
906 # do_package_write_* and do_package doesn't need do_populate_sysroot, unless is a postinstall dependency 903 # do_package_write_* need do_populate_sysroot as they're mainly postinstall dependencies
907 if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata', 'do_package_qa']: 904 if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']:
908 if isPostInstDep(taskdependees[task][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: 905 return False
909 return False 906 # do_package/packagedata/package_qa don't need do_populate_sysroot
907 if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_packagedata', 'do_package_qa']:
910 continue 908 continue
911 # Native/Cross packages don't exist and are noexec anyway 909 # Native/Cross packages don't exist and are noexec anyway
912 if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata', 'do_package', 'do_package_qa']: 910 if isNativeCross(taskdependees[dep][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm', 'do_packagedata', 'do_package', 'do_package_qa']: