summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@intel.com>2010-11-22 16:05:10 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-20 17:54:16 +0000
commit3f814ff9c48c896bf2a60dec6d86127c89d7747a (patch)
treeaa02f7b5e334f84de58569d0f137e13e2c4980d8 /meta/classes
parentd4ba59c87e06c6266e4abe349bd5255203cf868f (diff)
downloadpoky-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/classes')
-rw-r--r--meta/classes/sstate.bbclass12
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}"
6 6
7 7
8SSTATE_PKGARCH = "${BASE_PACKAGE_ARCH}" 8SSTATE_PKGARCH = "${BASE_PACKAGE_ARCH}"
9SSTATE_PKGNAME = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-${BB_TASKHASH}" 9SSTATE_PKGSPEC = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-"
10SSTATE_PKGNAME = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
10SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}" 11SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
11 12
12SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f" 13SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f"
@@ -190,9 +191,12 @@ def sstate_installpkg(ss, d):
190 return True 191 return True
191 192
192def sstate_clean_cachefile(ss, d): 193def sstate_clean_cachefile(ss, d):
193 sstatepkg = bb.data.getVar('SSTATE_PKG', d, True) + '_' + ss['name'] + ".tgz" 194 import oe.path
194 bb.note("Removing %s" % sstatepkg) 195
195 oe.path.remove(sstatepkg) 196 sstatepkgdir = bb.data.getVar('SSTATE_DIR', d, True)
197 sstatepkgfile = sstatepkgdir + '/' + bb.data.getVar('SSTATE_PKGSPEC', d, True) + "*_" + ss['name'] + ".tgz*"
198 bb.note("Removing %s" % sstatepkgfile)
199 oe.path.remove(sstatepkgfile)
196 200
197def sstate_clean_cachefiles(d): 201def sstate_clean_cachefiles(d):
198 for task in (bb.data.getVar('SSTATETASKS', d, True) or "").split(): 202 for task in (bb.data.getVar('SSTATETASKS', d, True) or "").split():