narcissus: try cleaning up stale files at the start of every build

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
joelagnel · Dec 4, 2010 · 36f2fa4 · 36f2fa4
1 parent 9761524
commit 36f2fa4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/scripts/assemble-image.sh b/scripts/assemble-image.sh
@@ -55,7 +55,7 @@ if [ -e ${WORKDIR}/conf/${MACHINE}/sd ] ; then
 		BYTES_PER_SECTOR="$(/sbin/fdisk -l -u sd.img | grep Units | awk '{print $9}')"
 		VFAT_SECTOR_OFFSET="$(/sbin/fdisk -l -u sd.img | grep img1 | awk '{print $3}')"
 
-		LOOP_DEV="/dev/loop0"
+		LOOP_DEV="/dev/loop1"
 		echo "/sbin/losetup -v -o $(expr ${BYTES_PER_SECTOR} "*" ${VFAT_SECTOR_OFFSET}) ${LOOP_DEV} sd.img"
 		/sbin/losetup -v -o $(expr ${BYTES_PER_SECTOR} "*" ${VFAT_SECTOR_OFFSET}) ${LOOP_DEV} sd.img
 

diff --git a/scripts/configure-image.sh b/scripts/configure-image.sh
@@ -4,8 +4,9 @@
 # Koen Kooi (c) 2008, 2009 - all rights reserved 
 
 echo "cleaning up stale files"
-find /tmp -name "opkg*" -mtime +2 -exec rm -r {} \;
-#find deploy -depth -mindepth 2 -mtime +4 -delete
+find /tmp -name 'opkg*' -mtime +2 -exec rm -rv {} \;
+find deploy -depth -mindepth 2 -maxdepth 2 -mtime +3 -exec rm -rv {} \;
+find work -depth -mindepth 1 -maxdepth 2 -mtime +1 -exec rm -rfv {} \;
 
 MACHINE=$1
 IMAGENAME=$2