From patchwork Fri Dec 14 15:39:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: sstate.bbclass: Improve stamp-extra-info task handling to avoid warnings Date: Fri, 14 Dec 2012 15:39:56 -0000 From: Richard Purdie X-Patchwork-Id: 41025 Message-Id: <1355499596.32519.22.camel@ted> To: openembedded-core If you change a machine to a different package architecture, you will see sstate errors about overwriting files as the code stands today. Instead it should clean out the files safely and correctly. This patch changes the naming of stamp-extra-info manifest files to avoid this problem. It will potentially trigger warnings during builds in existing TMPDIRs until the system adjusts to the new naming, these are harmless. [YOCTO #3521] Signed-off-by: Richard Purdie --- diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index d3daf1c..94be3ce 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -124,10 +124,12 @@ def sstate_install(ss, d): sharedfiles = [] shareddirs = [] bb.mkdirhier(d.expand("${SSTATE_MANIFESTS}")) - manifest = d.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name']) + + d2 = d.createCopy() extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True) if extrainf: - manifest = manifest + "." + extrainf + d2.setVar("SSTATE_MANMACH", extrainf) + manifest = d2.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name']) if os.access(manifest, os.R_OK): bb.fatal("Package already staged (%s)?!" % manifest) @@ -315,10 +317,12 @@ def sstate_clean_manifest(manifest, d): def sstate_clean(ss, d): import oe.path - manifest = d.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name']) + d2 = d.createCopy() extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True) if extrainf: - manifest = manifest + "." + extrainf + d2.setVar("SSTATE_MANMACH", extrainf) + manifest = d2.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name']) + bb.error(str(manifest)) if os.path.exists(manifest): locks = []