r3429 - trunk/src/host/qemu-neo1973/openmoko
andrew at sita.openmoko.org
andrew at sita.openmoko.org
Fri Nov 16 02:30:11 CET 2007
Author: andrew
Date: 2007-11-16 02:30:09 +0100 (Fri, 16 Nov 2007)
New Revision: 3429
Modified:
trunk/src/host/qemu-neo1973/openmoko/download.sh
trunk/src/host/qemu-neo1973/openmoko/env
trunk/src/host/qemu-neo1973/openmoko/flash.sh
Log:
More proper error checking. Use ScaredyCat's buildhost as backup.
Modified: trunk/src/host/qemu-neo1973/openmoko/download.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/download.sh 2007-11-14 17:18:16 UTC (rev 3428)
+++ trunk/src/host/qemu-neo1973/openmoko/download.sh 2007-11-16 01:30:09 UTC (rev 3429)
@@ -28,6 +28,14 @@
files=`lynx -dump $download_dir | grep http | sed "s,[0-9 \t\.]*$download_dir\([a-zA-Z0-9_\.-]\)[ \t]*,\1,"`
dev_files=`lynx -dump $dev_download_dir | grep http | sed "s,[0-9 \t\.]*$dev_download_dir\([a-zA-Z0-9_\.-]\)[ \t]*,\1,"`
+if [[ "${files}" == "" ]]; then
+ echo " "Trying alternative sources
+ download_dir="$backup_download_dir"
+ dev_download_dir="$backup_download_dir"
+ files=`lynx -dump $download_dir | grep http | sed "s,[0-9 \t\.]*$download_dir\([a-zA-Z0-9_\.-]\)[ \t]*,\1,"`
+ dev_files="$files"
+fi
+
most_recent () {
${echo} > .list
f=$3files; for name in ${!f}; do
@@ -37,7 +45,7 @@
done
export $2=`sort -n .list | tail -n 1`
rm -rf .list
- [ -z "${!2}" ] && ( ${echo} not found; exit -1 )
+ [ -z "${!2}" ] && ${echo} not found && exit -1
${echo} ${!2}
}
Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env 2007-11-14 17:18:16 UTC (rev 3428)
+++ trunk/src/host/qemu-neo1973/openmoko/env 2007-11-16 01:30:09 UTC (rev 3429)
@@ -20,8 +20,9 @@
# We don't want the "-latest" symlinks to match
kernel_wildcard="uImage-2.6.*-neo1973.bin"
-rootfs_wildcard="OpenMoko-openmoko-image-*.rootfs.jffs2"
+rootfs_wildcard="OpenMoko-openmoko-devel-image-*.rootfs.jffs2"
uboot_wildcard="u-boot-gta01bv4-1*.bin"
download_dir="http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/images/neo1973/"
dev_download_dir="http://buildhost.openmoko.org/snapshots/2007.08/images/"
+backup_download_dir="http://buildhost.automated.it/OM2007.2/"
Modified: trunk/src/host/qemu-neo1973/openmoko/flash.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/flash.sh 2007-11-14 17:18:16 UTC (rev 3428)
+++ trunk/src/host/qemu-neo1973/openmoko/flash.sh 2007-11-16 01:30:09 UTC (rev 3429)
@@ -48,7 +48,7 @@
%(os.stat('$img_dir/${!2}').st_size)\"`"
cd $script_dir
[ -e "${!2}" ] || ln -sf $img_dir/${!2} ${!2}
- [ -n "${!3}" ]
+ [ -s "${!2}" ]
}
most_recent "$kernel_wildcard" kernel_image kernel_size || exit -1
More information about the commitlog
mailing list