diff options
| author |   Paul Eggleton <paul.eggleton@intel.com> | 2010-11-22 16:05:10 +0000 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-12-20 17:54:16 +0000 |
| commit | 3f814ff9c48c896bf2a60dec6d86127c89d7747a (patch) | |
| tree | aa02f7b5e334f84de58569d0f137e13e2c4980d8 /meta | |
| parent | d4ba59c87e06c6266e4abe349bd5255203cf868f (diff) | |
| download | openembedded-core-3f814ff9c48c896bf2a60dec6d86127c89d7747a.tar.gz | |
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.
Signed-off-by: Paul Eggleton <paul.eggleton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | 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 3696a8cd3b..0ba130c886 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(): |