Skip to contentSkip to conversation

sstate task dependency fix

PATCH New Paul Eggleton 1 participant 2 messages Aug 18, 2014

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover sstate task dependency fix

The following change since commit 0300a46a8350cc58b40cfc5887ab04f0b0f5435e:

site/common-darwin: Really fix common-darwin typo (2014-08-18 10:00:14 +0100)

is available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/sstate
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/sstate

Paul Eggleton (1):
classes/sstate: ensure do_package_qa_setscene doesn't pull in
do_package_setscene

 meta/classes/sstate.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
1.9.3
author
#1 lore raw

PATCH 1/1 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.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/classes/sstate.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/classes/sstate.bbclass +3 -3
index 0d3940e..4eec6bd 100644
@@ -733,15 +733,15 @@ def setscene_depvalid(task, taskdependees, notneeded, d):
         if dep in notneeded:
             continue
         # 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']:
+        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']:
+        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
             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']:
+        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']:
             continue
 
         # Consider sysroot depending on sysroot tasks
Signature · 1 line
1.9.3