summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/qemu-ifup (renamed from scripts/qemu/qemu-ifup)0
-rwxr-xr-xscripts/qemu/qemu-ext28
-rwxr-xr-xscripts/qemu/qemu-nfs14
-rwxr-xr-xscripts/runqemu48
-rw-r--r--scripts/runqemu.README (renamed from scripts/qemu/README)37
5 files changed, 67 insertions, 40 deletions
diff --git a/scripts/qemu/qemu-ifup b/scripts/qemu-ifup
index da3918c6ac..da3918c6ac 100755
--- a/scripts/qemu/qemu-ifup
+++ b/scripts/qemu-ifup
diff --git a/scripts/qemu/qemu-ext2 b/scripts/qemu/qemu-ext2
deleted file mode 100755
index 4d69f0f1ca..0000000000
--- a/scripts/qemu/qemu-ext2
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-if [ -z "$QEMU_MEMORY" ]
-then
-QEMU_MEMORY="64M"
-fi
-
-qemu-system-arm -kernel $1 -append "root=/dev/sda mem=$QEMU_MEMORY" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=./qemu-ifup -M versatilepb -hda $2 -usb -usbdevice wacom-tablet
diff --git a/scripts/qemu/qemu-nfs b/scripts/qemu/qemu-nfs
deleted file mode 100755
index 503aaa2e02..0000000000
--- a/scripts/qemu/qemu-nfs
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ -z "$QEMU_MEMORY" ]
-then
-QEMU_MEMORY="64M"
-fi
-
-# New command-line for versatile/PB
-dd if=/dev/zero of=/tmp/blank bs=1024 count=8192
-qemu-system-arm -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/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=./qemu-ifup -M versatilepb -hda /tmp/blank
-rm /tmp/blank
-
-# Old command-line for versatile/CP
-#qemu-system-arm -kernel $1 -append "root=/dev/nfs nfsroot=192.168.7.1:/srv/qemuarm rw ip=192.168.7.2::192.168.7.1:255.255.255.0 mem=$QEMU_MEMORY" -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=./qemu-ifup
diff --git a/scripts/runqemu b/scripts/runqemu
new file mode 100755
index 0000000000..49403a6167
--- /dev/null
+++ b/scripts/runqemu
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/bin:$PATH
+
+if [ -z "$QEMU_MEMORY" ]; then
+ QEMU_MEMORY="64M"
+fi
+
+if [ "x$1" != "x" ]; then
+ MACHINE=$1
+else
+ MACHINE="qemuarm"
+fi
+
+if [ "x$2" != "x" ]; then
+ TYPE=$1
+else
+ TYPE="ext2"
+fi
+
+if [ "x$3" != "x" ]; then
+ ZIMAGE=$3
+fi
+
+if [ "x$4" != "x" ]; then
+ HDIMAGE=$4
+fi
+
+if [ "$MACHINE" == "qemuarm" ]; then
+ if [ "x$ZIMAGE" == "x" ]; then
+ ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-qemuarm.bin
+ fi
+
+ QEMU=`which qemu-system-arm`
+
+ if [ "$TYPE" == "ext2" ]; then
+ if [ "x$HDIMAGE" == "x" ]; then
+ HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemuarm.ext2
+ fi
+ 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
+ fi
+ if [ "$TYPE" == "nfs" -a ]; then
+ dd if=/dev/zero of=/tmp/blank bs=1024 count=8192
+ sudo $QEMU -kernel $1 -append "root=/dev/sda nfsroot=192.168.7.1:/srv/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
+ rm /tmp/blank
+ fi
+fi
+
diff --git a/scripts/qemu/README b/scripts/runqemu.README
index 10bf64ebba..713e273946 100644
--- a/scripts/qemu/README
+++ b/scripts/runqemu.README
@@ -1,19 +1,24 @@
-qemu-arm poky image notes
-=========================
+Using qemu with poky notes
+==========================
-Poky can generate qemu-system-arm bootable kernels and images with can
-then be used on an x86 desktop. There are two ways to run such images;
+Poky can generate qemu bootable kernels and images with can be used
+on a desktop system. Both arm and x86 images can currently be booted.
+The runqemu script is run as:
-Via ext2 filesystem image
-==========================
+ runqemu <target> <type> <zimage> <filesystem>
-Run;
+where:
-qemu-ext2 <zimage-qemuarm>.bin <filesystem-qemuarm>.ext2
+ <target> is "qemuarm" or "qemux86"
+ <type> is "ext2" or "nfs"
+ <zimage> is the path to a kernel (zimage-qemuarm.bin)
+ <filesystem> is the path to an ext2 image (filesystem-qemuarm.ext2)
+It will default to the qemuarm, ext2 and the last kernel and oh-image-pda
+image built by poky.
-Via NFS
-========
+NFS Image Notes
+===============
As root;
@@ -33,26 +38,22 @@ Edit via /etc/exports :
untar build/tmp/deploy/images/<built image>.rootfs.tar.bz2 into /srv/qemuarm
-Move poky built qemu-system-arm into your path, i.e;
-
-% cp ./build/tmp/staging/i686-linux/bin/qemu-system-arm /usr/local/bin
-
Finally, launch:
-% ./qemu-nfs ../../build/tmp/deploy/images/<zimage-qemuarm>.bin
-
-( change perms on /dev/net/tun to run as non root )
+% runqemu <target> nfs
Notes
=====
+ - The runqemu script runs qemu with sudo. Change perms on /dev/net/tun to
+ run as non root
- You can set QEMU_MEMORY env var to control amount of available memory
( defaults to 64M )
- There is a bug in qemu in that means occasionally it will use 100% cpu.
You will need to restart it in this situation.
-
More Info
=========
- See http://o-hand.com/~richard/qemu.html
+