summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2014-08-18 15:21:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-18 21:47:58 +0100
commitbe02588097dcdb61b76e5788a67ab062dabc78ad (patch)
treef7addd1b192aa2625820ab9b80e02dc9f01db967 /meta
parent3223a704f9185e4a828f982b00b653becf0f548b (diff)
downloadpoky-be02588097dcdb61b76e5788a67ab062dabc78ad.tar.gz
classes/sstate: ensure do_package_qa_setscene doesn't pull in do_package_setscene
If we have done do_package_qa_setscene we do not also need do_package_setscene. This means we can again for example rebuild an image without needing do_package sstate packages to be present. (From OE-Core rev: a0f584ac3d5a94dec121b684206ecd40c968f7fc) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/sstate.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 0d3940e409..4eec6bd0f7 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -733,15 +733,15 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
733 if dep in notneeded: 733 if dep in notneeded:
734 continue 734 continue
735 # do_package_write_* and do_package doesn't need do_package 735 # do_package_write_* and do_package doesn't need do_package
736 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']: 736 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']:
737 continue 737 continue
738 # do_package_write_* and do_package doesn't need do_populate_sysroot, unless is a postinstall dependency 738 # do_package_write_* and do_package doesn't need do_populate_sysroot, unless is a postinstall dependency
739 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']: 739 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']:
740 if isPostInstDep(taskdependees[task][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']: 740 if isPostInstDep(taskdependees[task][0]) and taskdependees[dep][1] in ['do_package_write_deb', 'do_package_write_ipk', 'do_package_write_rpm']:
741 return False 741 return False
742 continue 742 continue
743 # Native/Cross packages don't exist and are noexec anyway 743 # Native/Cross packages don't exist and are noexec anyway
744 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']: 744 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']:
745 continue 745 continue
746 746
747 # Consider sysroot depending on sysroot tasks 747 # Consider sysroot depending on sysroot tasks