sstate.bbclass: delete sstate files when doing cleanall
cover sstate.bbclass: delete sstate files when doing cleanall
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 <[email protected]>
---
Paul Eggleton (1):
sstate.bbclass: delete sstate files when doing cleanall
meta/classes/sstate.bbclass | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
Signature · 12 lines
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 1/1 sstate.bbclass: delete sstate files when doing cleanall
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.
--- meta/classes/sstate.bbclass | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
meta/classes/sstate.bbclass +8 -4
@@ -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():
Signature · 12 lines
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.
Quoted 5 lines · 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
Quoted 7 lines · 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 <[email protected]>
I can confirm that this bug still exists and that this patch fixes it.
Cheers,
Joshua
Signature · 2 lines
Joshua Lock
Intel Open Source Technology CentreQuoted 8 lines · Paul Eggleton
Quoted 5 lines · 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-fixHas 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