summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-30 17:10:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-02 05:52:06 -0700
commit1c64c6b3002b4a01e590263c730e22c89d869bb7 (patch)
treee1ddb1a334e8d2098f5912fafdd811598bc26856
parentc3bf244418ef466fc9e298b0d1e4c0336be469bd (diff)
downloadpoky-1c64c6b3002b4a01e590263c730e22c89d869bb7.tar.gz
sstate.bbclass: Remove hardcoded task mappings
I've not idea why this got left in but as per the comment, it needs fixing and we shouldn't have hardcoded mappings like this. Lets remove it and dynamically generate the data instead. [YOCTO #3039] (From OE-Core rev: 2df064ad46c1510fa8a401c22db4ab3278c3c807) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sstate.bbclass18
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 003763b412..9a168d460d 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -561,21 +561,19 @@ sstate_unpack_package () {
561 tar -xvzf ${SSTATE_PKG} 561 tar -xvzf ${SSTATE_PKG}
562} 562}
563 563
564EXTRASSTATEMAPS = "do_deploy:deploy"
565
564BB_HASHCHECK_FUNCTION = "sstate_checkhashes" 566BB_HASHCHECK_FUNCTION = "sstate_checkhashes"
565 567
566def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d): 568def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d):
567 569
568 ret = [] 570 ret = []
569 # This needs to go away, FIXME 571 mapping = {}
570 mapping = { 572 for t in d.getVar("SSTATETASKS", True).split():
571 "do_populate_sysroot" : "populate-sysroot", 573 mapping[t] = d.getVarFlag(t, "sstate-name", True)
572 "do_populate_lic" : "populate-lic", 574 for extra in d.getVar("EXTRASSTATEMAPS", True).split():
573 "do_package_write_ipk" : "deploy-ipk", 575 e = extra.split(":")
574 "do_package_write_deb" : "deploy-deb", 576 mapping[e[0]] = e[1]
575 "do_package_write_rpm" : "deploy-rpm",
576 "do_package" : "package",
577 "do_deploy" : "deploy",
578 }
579 577
580 for task in range(len(sq_fn)): 578 for task in range(len(sq_fn)):
581 spec = sq_hashfn[task].split(" ")[1] 579 spec = sq_hashfn[task].split(" ")[1]