r3344 - trunk/src/host/qemu-neo1973/openmoko

[andrew at sita.openmoko.org]

Author: andrew
Date: 2007-11-03 03:15:09 +0100 (Sat, 03 Nov 2007)
New Revision: 3344

Modified:
   trunk/src/host/qemu-neo1973/openmoko/download.sh
   trunk/src/host/qemu-neo1973/openmoko/env
Log:
Get the latest builds from buildhost again.


Modified: trunk/src/host/qemu-neo1973/openmoko/download.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/download.sh	2007-11-02 22:00:28 UTC (rev 3343)
+++ trunk/src/host/qemu-neo1973/openmoko/download.sh	2007-11-03 02:15:09 UTC (rev 3344)
@@ -26,12 +26,13 @@
 
 echo "    "Retrieving available builds list...
 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,"`
 
 most_recent () {
 	${echo} > .list
-	for name in $files; do
+	f=$3files; for name in ${!f}; do
 		if [[ "$name" == $1 ]]; then
-			${echo} "$name" > .list
+			${echo} "$name" >> .list
 		fi
 	done
 	export $2=`sort -n .list | tail -n 1`
@@ -41,23 +42,23 @@
 }
 
 ${echo} -n "    "Kernel is...\ 
-most_recent "$kernel_wildcard" kernel_image || exit -1
+most_recent "$kernel_wildcard" kernel_image "" || exit -1
 ${echo} -n "    "Root filesystem is...\ 
-most_recent "$rootfs_wildcard" rootfs_image || exit -1
+most_recent "$rootfs_wildcard" rootfs_image "" || exit -1
 ${echo} -n "    "U-boot is...\ 
-most_recent "$uboot_wildcard" uboot_image || exit -1
+most_recent "$uboot_wildcard" uboot_image dev_ || exit -1
 
 sleep 2
 
 download () {
 	[ -s "$1" ] && return
 	rm -rf "$1"
-	wget "$download_dir/$1"
+	dir=$2download_dir; wget "${!dir}$1"
 }
 
-download "$kernel_image" || exit -1
-download "$rootfs_image" || exit -1
-download "$uboot_image" || exit -1
+download "$kernel_image" "" || exit -1
+download "$rootfs_image" "" || exit -1
+download "$uboot_image" dev_ || exit -1
 
 echo
 echo "    "Now use openmoko/flash.sh to install OpenMoko to NAND Flash.

Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env	2007-11-02 22:00:28 UTC (rev 3343)
+++ trunk/src/host/qemu-neo1973/openmoko/env	2007-11-03 02:15:09 UTC (rev 3344)
@@ -18,8 +18,10 @@
 splash_addr=0x36000000
 splash_size=0x5000
 
+# We don't want the "-latest" symlinks to match
 kernel_wildcard="uImage-2.6.*-neo1973.bin"
-rootfs_wildcard="OpenMoko*.rootfs.jffs2"
-uboot_wildcard="u-boot-gta01b*.bin"
+rootfs_wildcard="OpenMoko-openmoko-image-*.rootfs.jffs2"
+uboot_wildcard="u-boot-gta01bv4-1*.bin"
 
-download_dir="http://buildhost.openmoko.org/snapshots/2007.08/images/"
+download_dir="http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/images/neo1973/"
+dev_download_dir="http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/images/fic-gta01/"