summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-30 11:16:21 (GMT)
committerRichard Purdie <richard@openedhand.com>2006-11-30 11:16:21 (GMT)
commitd35635aff2a9ba8383b8ba295ec9684185d1f372 (patch)
treec48577bcd69adb2c97dd4bf80ec3e7d260e13eef /scripts
parent6ee267a55e1fc0df5267021de17814f2fda43e6b (diff)
downloadpoky-d35635aff2a9ba8383b8ba295ec9684185d1f372.tar.gz
scripts/runqemu improvements:
* Try harder to find ifconfig * Error out if the environment isn't correct * Tell the user we're running sudo git-svn-id: https://svn.o-hand.com/repos/poky/trunk@989 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/qemu-ifup9
-rwxr-xr-xscripts/runqemu9
2 files changed, 17 insertions, 1 deletions
diff --git a/scripts/qemu-ifup b/scripts/qemu-ifup
index da3918c..8abe35f 100755
--- a/scripts/qemu-ifup
+++ b/scripts/qemu-ifup
@@ -1,2 +1,9 @@
1#!/bin/sh 1#!/bin/sh
2ifconfig tap0 192.168.7.1 \ No newline at end of file 2
3IFCONFIG=`which ifconfig`
4if [ "x$IFCONFIG" == "x" ]; then
5 # better than nothing...
6 IFCONFIG=/sbin/ifconfig
7fi
8
9$IFCONFIG tap0 192.168.7.1
diff --git a/scripts/runqemu b/scripts/runqemu
index d1e3351..3b4ad1b 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1,5 +1,10 @@
1#!/bin/sh 1#!/bin/sh
2 2
3if [ "x$BUILDDIR" == "x" ]; then
4 echo "You need to source poky-init-build-env before running this script"
5 exit 1
6fi
7
3PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/bin:$PATH 8PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/bin:$PATH
4 9
5KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0" 10KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0"
@@ -40,10 +45,12 @@ if [ "$MACHINE" == "qemuarm" ]; then
40 if [ "x$HDIMAGE" == "x" ]; then 45 if [ "x$HDIMAGE" == "x" ]; then
41 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemuarm.ext2 46 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemuarm.ext2
42 fi 47 fi
48 echo "Running $QEMU using sudo..."
43 sudo $QEMU -kernel $ZIMAGE -append "root=/dev/sda mem=$QEMU_MEMORY" $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet 49 sudo $QEMU -kernel $ZIMAGE -append "root=/dev/sda mem=$QEMU_MEMORY" $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet
44 fi 50 fi
45 if [ "$TYPE" == "nfs" ]; then 51 if [ "$TYPE" == "nfs" ]; then
46 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192 52 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192
53 echo "Running $QEMU using sudo..."
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 54 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
48 rm /tmp/blank 55 rm /tmp/blank
49 fi 56 fi
@@ -61,10 +68,12 @@ if [ "$MACHINE" == "qemux86" ]; then
61 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemux86.ext2 68 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemux86.ext2
62 fi 69 fi
63 # video=vesafb:1024x768-32@86 70 # video=vesafb:1024x768-32@86
71 echo "Running $QEMU using sudo..."
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 72 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
65 fi 73 fi
66 if [ "$TYPE" == "nfs" ]; then 74 if [ "$TYPE" == "nfs" ]; then
67 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192 75 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192
76 echo "Running $QEMU using sudo..."
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 77 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
69 rm /tmp/blank 78 rm /tmp/blank
70 fi 79 fi