sstate.bbclass: Remove hardcoded task mappings

PATCH New Richard Purdie 1 participant 1 message Aug 31, 2012

Share & tools

Richard Purdie

author

2012-08-31 08:03 UTC #0 lore raw

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

Signed-off-by Richard Purdie <[email protected]>

---

meta/classes/sstate.bbclass +3 ~~-10~~

index 6762e32..e4b70b3 100644
@@ -519,16 +519,9 @@ 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 task in range(len(sq_fn)):
         spec = sq_hashfn[task].split(" ")[1]