sstate: Drop the depchain isPostDep() checks
The dependencies of do_package_write_* tasks are either going to be packaging tools needed to build the packages, or, native tools needed at postinst time. Now we've formalised this dependency pattern, drop the hardcoded list and work based on the rule. The package creation tools are usually the same tools needed at rootfs/postinst time anyway so the difference is moot. (From OE-Core rev: 8082c6aabf838a2cc5253d2bb1bd8867f2e1ba6a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
bc7162a46c
commit
efd120e714
|
@ -871,17 +871,14 @@ BB_SETSCENE_DEPVALID = "setscene_depvalid"
|
|||
def setscene_depvalid(task, taskdependees, notneeded, d):
|
||||
# taskdependees is a dict of tasks which depend on task, each being a 3 item list of [PN, TASKNAME, FILENAME]
|
||||
# task is included in taskdependees too
|
||||
# Return - False - We need this dependency
|
||||
# - True - We can skip this dependency
|
||||
|
||||
bb.debug(2, "Considering setscene task: %s" % (str(taskdependees[task])))
|
||||
|
||||
def isNativeCross(x):
|
||||
return x.endswith("-native") or "-cross-" in x or "-crosssdk" in x
|
||||
|
||||
def isPostInstDep(x):
|
||||
if x in ["qemu-native", "gdk-pixbuf-native", "qemuwrapper-cross", "depmodwrapper-cross", "systemd-systemctl-native", "gtk-icon-utils-native", "ca-certificates-native"]:
|
||||
return True
|
||||
return False
|
||||
|
||||
# We only need to trigger populate_lic through direct dependencies
|
||||
if taskdependees[task][1] == "do_populate_lic":
|
||||
return True
|
||||
|
@ -903,10 +900,11 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
|
|||
# do_package_write_* and do_package doesn't need do_package
|
||||
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']:
|
||||
continue
|
||||
# do_package_write_* and do_package doesn't need do_populate_sysroot, unless is a postinstall dependency
|
||||
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']:
|
||||
if isPostInstDep(taskdependees[task][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']:
|
||||
return False
|
||||
# do_package_write_* need do_populate_sysroot as they're mainly postinstall dependencies
|
||||
if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']:
|
||||
return False
|
||||
# do_package/packagedata/package_qa don't need do_populate_sysroot
|
||||
if taskdependees[task][1] == "do_populate_sysroot" and taskdependees[dep][1] in ['do_package', 'do_packagedata', 'do_package_qa']:
|
||||
continue
|
||||
# Native/Cross packages don't exist and are noexec anyway
|
||||
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']:
|
||||
|
|
Loading…
Reference in New Issue