aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-06-30 11:53:28 -0700
committerKhem Raj <raj.khem@gmail.com>2010-06-30 11:55:32 -0700
commit48dfe40e52ce3e539cc8b39308c0f6aac07c68c6 (patch)
tree2a5e044c820c3b04dec7a0b16293407a90c12b2d /contrib
parent1f1a416035bc0054eea1db857bad948ca06748ea (diff)
downloadopenembedded-48dfe40e52ce3e539cc8b39308c0f6aac07c68c6.tar.gz
openembedded-48dfe40e52ce3e539cc8b39308c0f6aac07c68c6.tar.bz2
openembedded-48dfe40e52ce3e539cc8b39308c0f6aac07c68c6.zip
contrib/qemu/run-qemu.sh: Dont search for hdimage when doing a nfsboot
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/qemu/run-qemu.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/contrib/qemu/run-qemu.sh b/contrib/qemu/run-qemu.sh
index 7f832609a1..92df17ce00 100755
--- a/contrib/qemu/run-qemu.sh
+++ b/contrib/qemu/run-qemu.sh
@@ -69,8 +69,8 @@ arch=$1
libc=$2
mem=256 # memory for guest server in Mb
imagetype="ext2"
-networking="no"
-nfsboot="no"
+networking="yes"
+nfsboot="yes"
staticip="yes"
case $arch in
@@ -94,7 +94,7 @@ case $arch in
rootdisk="hda"
qemuopts="-nographic"
kernel="vmlinux"
- image="minimalist-image"
+ image="native-sdk-image"
;;
ppc|powerpc)
arch=ppc
@@ -102,6 +102,7 @@ case $arch in
macaddr="00:16:3e:00:00:03"
machine="g3beige"
gdbport="1236"
+ mem="1024"
consoleopt="console=ttyS0"
rootdisk="hdc"
qemuopts="-nographic"
@@ -144,7 +145,7 @@ netmask="255.255.0.0" # subnet mask
hostname="qemu$arch" # hostname for guest server
nfsdir="/opt/oe/$hostname" # nfs directory where root file system is
device="eth0" # interface that guest server will use
-gdbit="-redir tcp:2222::22 -gdb tcp::$gdbport" # debug the kernel using gdb set it to -s
+#gdbit="-redir tcp:2222::22 -gdb tcp::$gdbport -S" # debug the kernel using gdb
# add -S to stop after launch and wait for
# gdb to connect
@@ -202,10 +203,13 @@ else
fi
kernelimage=$oetmpdir/deploy/$libc/images/qemu$arch/$kernel-qemu$arch.bin
hdimage=$oetmpdir/deploy/$libc/images/qemu$arch/$image-qemu$arch.$imagetype
+if [ $nfsboot != "yes" ]; then
+ qemuopts="$qemuopts -drive file=$hdimage"
+fi
echo "Starting QEMU ..."
set -x
$qemu -M $machine --snapshot $gdbit -m $mem \
- -kernel $kernelimage -drive file=$hdimage \
+ -kernel $kernelimage \
-usb -usbdevice wacom-tablet --no-reboot -localtime \
$qemuopts \
-append "$consoleopt $rootfs $ipopt $init debug user_debug=-1" \