diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-02-28 13:29:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-19 01:33:21 +0000 |
commit | 82af8b9fb6d6d1439943fd15b8a75c0e663e4a45 (patch) | |
tree | b4a74e16e24af218b483de192331cc47c2c5b2a0 /meta | |
parent | 7b8b77444dff12c79b918fc967beb47bebb40d65 (diff) | |
download | poky-82af8b9fb6d6d1439943fd15b8a75c0e663e4a45.tar.gz |
sstate.bbclass: always delete stamp files in sstate_clean
For safety, always delete the stamp files in sstate_clean regardless of
whether the manifest file exists or not.
(From OE-Core rev: f781c35da9a11eefdb06bda72ca89753df863efa)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/sstate.bbclass | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index c4f6733a28..d57c183004 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -229,17 +229,15 @@ def sstate_clean(ss, d): | |||
229 | 229 | ||
230 | manifest = bb.data.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'], d) | 230 | manifest = bb.data.expand("${SSTATE_MANFILEPREFIX}.%s" % ss['name'], d) |
231 | 231 | ||
232 | if not os.path.exists(manifest): | 232 | if os.path.exists(manifest): |
233 | return | 233 | locks = [] |
234 | for lock in ss['lockfiles']: | ||
235 | locks.append(bb.utils.lockfile(lock)) | ||
234 | 236 | ||
235 | locks = [] | 237 | sstate_clean_manifest(manifest, d) |
236 | for lock in ss['lockfiles']: | ||
237 | locks.append(bb.utils.lockfile(lock)) | ||
238 | 238 | ||
239 | sstate_clean_manifest(manifest, d) | 239 | for lock in locks: |
240 | 240 | bb.utils.unlockfile(lock) | |
241 | for lock in locks: | ||
242 | bb.utils.unlockfile(lock) | ||
243 | 241 | ||
244 | stfile = d.getVar("STAMP", True) + ".do_" + ss['task'] | 242 | stfile = d.getVar("STAMP", True) + ".do_" + ss['task'] |
245 | oe.path.remove(stfile) | 243 | oe.path.remove(stfile) |