summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-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]