summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-20 12:22:28 (GMT)
committerRichard Purdie <richard@openedhand.com>2006-11-20 12:22:28 (GMT)
commit131c98c899a8d48b0049380346dff1c145ee620b (patch)
treec6150c44387a8b52e2da67cfdaf2683d04e31946 /scripts
parent31f507e2917e00b8e3a124ef0c0b06e2b9c18b8a (diff)
downloadpoky-131c98c899a8d48b0049380346dff1c145ee620b.tar.gz
runqemu: Refactor network device commandlines and enable for qemux86 ext2 images (qemuarm ext2 images attempt dhcp and hang for some reason)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@879 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu11
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index dead347..d1e3351 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -2,6 +2,9 @@
2 2
3PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/bin:$PATH 3PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/bin:$PATH
4 4
5KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0"
6QEMU_NETWORK_CMD="-net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup"
7
5if [ -z "$QEMU_MEMORY" ]; then 8if [ -z "$QEMU_MEMORY" ]; then
6 QEMU_MEMORY="64M" 9 QEMU_MEMORY="64M"
7fi 10fi
@@ -37,11 +40,11 @@ if [ "$MACHINE" == "qemuarm" ]; then
37 if [ "x$HDIMAGE" == "x" ]; then 40 if [ "x$HDIMAGE" == "x" ]; then
38 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemuarm.ext2 41 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemuarm.ext2
39 fi 42 fi
40 sudo $QEMU -kernel $ZIMAGE -append "root=/dev/sda mem=$QEMU_MEMORY" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet 43 sudo $QEMU -kernel $ZIMAGE -append "root=/dev/sda mem=$QEMU_MEMORY" $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet
41 fi 44 fi
42 if [ "$TYPE" == "nfs" ]; then 45 if [ "$TYPE" == "nfs" ]; then
43 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192 46 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192
44 sudo $QEMU -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/qemuarm rw ip=192.168.7.2::192.168.7.1:255.255.255.0" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup -M versatilepb -hda /tmp/blank 47 sudo $QEMU -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/qemuarm rw $KERNEL_NETWORK_CMD" $QEMU_NETWORK_CMD -M versatilepb -hda /tmp/blank
45 rm /tmp/blank 48 rm /tmp/blank
46 fi 49 fi
47fi 50fi
@@ -58,11 +61,11 @@ if [ "$MACHINE" == "qemux86" ]; then
58 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemux86.ext2 61 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemux86.ext2
59 fi 62 fi
60 # video=vesafb:1024x768-32@86 63 # video=vesafb:1024x768-32@86
61 sudo $QEMU -std-vga -kernel $ZIMAGE -append "root=/dev/hda mem=$QEMU_MEMORY" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup -hda $HDIMAGE -usb -usbdevice wacom-tablet 64 sudo $QEMU -std-vga -kernel $ZIMAGE -append "root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet
62 fi 65 fi
63 if [ "$TYPE" == "nfs" ]; then 66 if [ "$TYPE" == "nfs" ]; then
64 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192 67 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192
65 sudo $QEMU -std-vga -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/qemux86 rw ip=192.168.7.2::192.168.7.1:255.255.255.0" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$OEROOT/scripts/qemu-ifup -hda /tmp/blank 68 sudo $QEMU -std-vga -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/qemux86 rw $KERNEL_NETWORK_CMD" $QEMU_NETWORK_CMD -hda /tmp/blank
66 rm /tmp/blank 69 rm /tmp/blank
67 fi 70 fi
68fi 71fi