r3671 - trunk/src/host/qemu-neo1973/openmoko
andrew at sita.openmoko.org
andrew at sita.openmoko.org
Tue Dec 18 05:11:56 CET 2007
Author: andrew
Date: 2007-12-18 05:11:54 +0100 (Tue, 18 Dec 2007)
New Revision: 3671
Modified:
trunk/src/host/qemu-neo1973/openmoko/env
trunk/src/host/qemu-neo1973/openmoko/qemu-auto.sh
trunk/src/host/qemu-neo1973/openmoko/qemu-upload.sh
Log:
Simplify qemu-update.
Modified: trunk/src/host/qemu-neo1973/openmoko/env
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/env 2007-12-18 03:51:53 UTC (rev 3670)
+++ trunk/src/host/qemu-neo1973/openmoko/env 2007-12-18 04:11:54 UTC (rev 3671)
@@ -13,6 +13,7 @@
echo=echo
which gecho && echo=gecho
export make echo
+dump_dir="$script_dir/vvfat"
qemu_monitor="$HOME/.qemu_monitor"
qemu_cmd () { $script_dir/qemu-cmd.pl "$qemu_monitor" "$*"; }
Modified: trunk/src/host/qemu-neo1973/openmoko/qemu-auto.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/qemu-auto.sh 2007-12-18 03:51:53 UTC (rev 3670)
+++ trunk/src/host/qemu-neo1973/openmoko/qemu-auto.sh 2007-12-18 04:11:54 UTC (rev 3671)
@@ -22,16 +22,16 @@
. openmoko/env
-if [ -e $qemu_monitor ]; then
+if [ -e "$qemu_monitor" ]; then
echo A QEMU session appears to be already active
exit -1
fi
-trap "rm -rf $qemu_monitor; stty sane" INT EXIT
+trap "rm -rf \"$qemu_monitor\" \"$dump_dir\"; stty sane" INT EXIT
$qemu -mtdblock "$script_dir/$flash_image" \
-kernel "$script_dir/openmoko-kernel.bin" \
-snapshot -usb -show-cursor -parallel none \
-usbdevice keyboard -usbgadget -serial stdio \
- -monitor unix:$qemu_monitor,server,nowait \
+ -monitor unix:"$qemu_monitor",server,nowait \
"$@"
Modified: trunk/src/host/qemu-neo1973/openmoko/qemu-upload.sh
===================================================================
--- trunk/src/host/qemu-neo1973/openmoko/qemu-upload.sh 2007-12-18 03:51:53 UTC (rev 3670)
+++ trunk/src/host/qemu-neo1973/openmoko/qemu-upload.sh 2007-12-18 04:11:54 UTC (rev 3671)
@@ -22,8 +22,15 @@
. openmoko/env
+if [ ! -e "$qemu_monitor" ]; then
+ echo No applicable QEMU session found
+ exit -1
+fi
+
if [[ "$1" == "" ]]; then
qemu_cmd eject
else
- qemu_cmd change sd0 fat:$1
+ rm -rf "$dump_dir"; mkdir -p "$dump_dir"
+ cp -fR "$@" "$dump_dir" # TODO: Use symlinks perhaps
+ qemu_cmd change sd0 "fat:$dump_dir"
fi
More information about the commitlog
mailing list