diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-30 17:10:03 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-02 05:52:06 -0700 |
| commit | 1c64c6b3002b4a01e590263c730e22c89d869bb7 (patch) | |
| tree | e1ddb1a334e8d2098f5912fafdd811598bc26856 | |
| parent | c3bf244418ef466fc9e298b0d1e4c0336be469bd (diff) | |
| download | ast2050-yocto-poky-1c64c6b3002b4a01e590263c730e22c89d869bb7.zip ast2050-yocto-poky-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.bbclass | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 003763b..9a168d4 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -561,21 +561,19 @@ sstate_unpack_package () { tar -xvzf ${SSTATE_PKG} } +EXTRASSTATEMAPS = "do_deploy:deploy" + BB_HASHCHECK_FUNCTION = "sstate_checkhashes" def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d): ret = [] - # This needs to go away, FIXME - mapping = { - "do_populate_sysroot" : "populate-sysroot", - "do_populate_lic" : "populate-lic", - "do_package_write_ipk" : "deploy-ipk", - "do_package_write_deb" : "deploy-deb", - "do_package_write_rpm" : "deploy-rpm", - "do_package" : "package", - "do_deploy" : "deploy", - } + mapping = {} + for t in d.getVar("SSTATETASKS", True).split(): + mapping[t] = d.getVarFlag(t, "sstate-name", True) + for extra in d.getVar("EXTRASSTATEMAPS", True).split(): + e = extra.split(":") + mapping[e[0]] = e[1] for task in range(len(sq_fn)): spec = sq_hashfn[task].split(" ")[1] |
