[PATCH 1/1] sstate.bbclass: delete sstate files when doing cleanall

[PATCH 1/1] sstate.bbclass: delete sstate files when doing cleanall

[Paul Eggleton]

This fixes the cleanall task to actually delete the sstage cache files. This
was not working correctly before due to attempting to use the current task's
hash in the package file name to be deleted, which of course is the hash of
the cleanall task when doing cleanall. The siginfo files are now deleted as
well.

Signed-off-by: Paul Eggleton <paul.eggleton@intel.com>
---
 meta/classes/sstate.bbclass |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 3696a8c..0ba130c 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -6,7 +6,8 @@ SSTATE_MANFILEPREFIX = "${SSTATE_MANFILEBASE}${PN}"
 
 
 SSTATE_PKGARCH    = "${BASE_PACKAGE_ARCH}"
-SSTATE_PKGNAME    = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-${BB_TASKHASH}"
+SSTATE_PKGSPEC    = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-"
+SSTATE_PKGNAME    = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
 SSTATE_PKG        = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
 
 SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f"
@@ -190,9 +191,12 @@ def sstate_installpkg(ss, d):
     return True
 
 def sstate_clean_cachefile(ss, d):
-    sstatepkg = bb.data.getVar('SSTATE_PKG', d, True) + '_' + ss['name'] + ".tgz"
-    bb.note("Removing %s" % sstatepkg)
-    oe.path.remove(sstatepkg)
+    import oe.path
+
+    sstatepkgdir = bb.data.getVar('SSTATE_DIR', d, True)
+    sstatepkgfile = sstatepkgdir + '/' + bb.data.getVar('SSTATE_PKGSPEC', d, True) + "*_" + ss['name'] + ".tgz*"
+    bb.note("Removing %s" % sstatepkgfile)
+    oe.path.remove(sstatepkgfile)
 
 def sstate_clean_cachefiles(d):
     for task in (bb.data.getVar('SSTATETASKS', d, True) or "").split():
-- 
1.7.3.1

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

[PATCH 0/1] sstate.bbclass: delete sstate files when doing cleanall

[Paul Eggleton]

Single commit which fixes deleting sstate cache files when doing cleanall.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: paule/sstate-clean-fix
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/sstate-clean-fix

Thanks,
    Paul Eggleton <paul.eggleton@intel.com>
---


Paul Eggleton (1):
  sstate.bbclass: delete sstate files when doing cleanall

 meta/classes/sstate.bbclass |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

-- 
1.7.3.1

---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

Re: [PATCH 0/1] sstate.bbclass: delete sstate files when doing cleanall

[Paul Eggleton]

On Monday 22 November 2010 16:20:20 Paul Eggleton wrote:
> Single commit which fixes deleting sstate cache files when doing cleanall.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: paule/sstate-clean-fix
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/sstate-clean-fix

Has anyone had a chance to look at this yet?

Cheers,
Paul

Re: [PATCH 1/1] sstate.bbclass: delete sstate files when doing cleanall

[Joshua Lock]

On Mon, 2010-11-22 at 16:05 +0000, Paul Eggleton wrote:
> This fixes the cleanall task to actually delete the sstage cache files. This
> was not working correctly before due to attempting to use the current task's
> hash in the package file name to be deleted, which of course is the hash of
> the cleanall task when doing cleanall. The siginfo files are now deleted as
> well.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@intel.com>

Acked-by: Joshua Lock <josh@linux.intel.com>

I can confirm that this bug still exists and that this patch fixes it.

Cheers,
Joshua
-- 
Joshua Lock
        Intel Open Source Technology Centre

Re: [PATCH 0/1] sstate.bbclass: delete sstate files when doing cleanall

[Richard Purdie]

On Mon, 2010-12-20 at 12:02 +0000, Paul Eggleton wrote:
> On Monday 22 November 2010 16:20:20 Paul Eggleton wrote:
> > Single commit which fixes deleting sstate cache files when doing cleanall.
> > 
> > Pull URL: git://git.pokylinux.org/poky-contrib.git
> >   Branch: paule/sstate-clean-fix
> >   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=paule/sstate-clean-fix
> 
> Has anyone had a chance to look at this yet?

I looked at it and wanted to think about the "*" in there further but
never quite got back to it. Its certainly the better way around for this
to work so I've merged it to master, thanks.

The concern btw, is how to disable packages on remote sstate mirrors...

Richard