diff options
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}" | |||
6 | 6 | ||
7 | 7 | ||
8 | SSTATE_PKGARCH = "${BASE_PACKAGE_ARCH}" | 8 | SSTATE_PKGARCH = "${BASE_PACKAGE_ARCH}" |
9 | SSTATE_PKGNAME = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-${BB_TASKHASH}" | 9 | SSTATE_PKGSPEC = "sstate-${PN}-${MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}-${PV}-${PR}-${SSTATE_PKGARCH}-${SSTATE_VERSION}-" |
10 | SSTATE_PKGNAME = "${SSTATE_PKGSPEC}${BB_TASKHASH}" | ||
10 | SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}" | 11 | SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}" |
11 | 12 | ||
12 | SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f" | 13 | SSTATE_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 | ||
192 | def sstate_clean_cachefile(ss, d): | 193 | def 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 | ||
197 | def sstate_clean_cachefiles(d): | 201 | def 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(): |