summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-23 20:19:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-24 15:12:03 +0000
commitd967a498cb464c3858dc280db5e67b7e7b281b02 (patch)
tree92521e211c59421c93142889471b0e05c1606a7a
parent4bbe7a5067452b43bf3258b17e2a653a2273b476 (diff)
downloadopenembedded-core-d967a498cb464c3858dc280db5e67b7e7b281b02.tar.gz
openembedded-core-d967a498cb464c3858dc280db5e67b7e7b281b02.tar.bz2
openembedded-core-d967a498cb464c3858dc280db5e67b7e7b281b02.zip
scripts/cleanup-workdir: Adpat to new workdir layout
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/cleanup-workdir12
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/cleanup-workdir b/scripts/cleanup-workdir
index 9d161c24d1..b2408fcfc6 100755
--- a/scripts/cleanup-workdir
+++ b/scripts/cleanup-workdir
@@ -22,7 +22,7 @@ import re
import subprocess
import shutil
-pkg_cur_dirs = []
+pkg_cur_dirs = {}
obsolete_dirs = []
parser = None
@@ -101,7 +101,7 @@ will be deleted. Be CAUTIOUS.""")
version = parse_version(elems[1])
else:
version = parse_version(elems[2])
- pkg_cur_dirs.append(elems[0] + '-' + version)
+ pkg_cur_dirs[elems[0]] = version
cmd = "bitbake -e"
output = run_command(cmd)
@@ -156,6 +156,14 @@ will be deleted. Be CAUTIOUS.""")
for pkgdir in sorted(pkgdirs):
if pkgdir not in pkg_cur_dirs:
obsolete_dirs.append(os.path.join(pkgroot, pkgdir))
+ else:
+ for verroot, verdirs, verfiles in os.walk(os.path.join(pkgroot, pkgdir)):
+ for f in verfiles:
+ obsolete_dirs.append(os.path.join(pkgroot, f))
+ for v in sorted(verdirs):
+ if v not in pkg_cur_dirs[pkgdir]:
+ obsolete_dirs.append(os.path.join(pkgroot, pkgdir, v))
+ break
# just process the top dir of every package under tmp/work/*/,
# then jump out of the above os.walk()