summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/qemu-ifup2
-rwxr-xr-xscripts/runqemu28
2 files changed, 15 insertions, 15 deletions
diff --git a/scripts/qemu-ifup b/scripts/qemu-ifup
index 8abe35f57b..af081fb4d7 100755
--- a/scripts/qemu-ifup
+++ b/scripts/qemu-ifup
@@ -1,7 +1,7 @@
1#!/bin/sh 1#!/bin/sh
2 2
3IFCONFIG=`which ifconfig` 3IFCONFIG=`which ifconfig`
4if [ "x$IFCONFIG" == "x" ]; then 4if [ "x$IFCONFIG" = "x" ]; then
5 # better than nothing... 5 # better than nothing...
6 IFCONFIG=/sbin/ifconfig 6 IFCONFIG=/sbin/ifconfig
7fi 7fi
diff --git a/scripts/runqemu b/scripts/runqemu
index b0273f4c38..63ea856b65 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -1,6 +1,6 @@
1#!/bin/sh 1#!/bin/sh
2 2
3if [ "x$BUILDDIR" == "x" ]; then 3if [ "x$BUILDDIR" = "x" ]; then
4 echo "You need to source poky-init-build-env before running this script" 4 echo "You need to source poky-init-build-env before running this script"
5 exit 1 5 exit 1
6fi 6fi
@@ -34,17 +34,17 @@ if [ "x$4" != "x" ]; then
34 HDIMAGE=$4 34 HDIMAGE=$4
35fi 35fi
36 36
37if [ "$MACHINE" == "qemuarm" -o "$MACHINE" == "spitz" -o "$MACHINE" == "borzoi" -o "$MACHINE" == "akita" ]; then 37if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" ]; then
38 QEMU=`which qemu-system-arm` 38 QEMU=`which qemu-system-arm`
39 if [ "x$ZIMAGE" == "x" ]; then 39 if [ "x$ZIMAGE" = "x" ]; then
40 ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin 40 ZIMAGE=$BUILDDIR/tmp/deploy/images/zImage-$MACHINE.bin
41 fi 41 fi
42 CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux/bin 42 CROSSPATH=$BUILDDIR/tmp/cross/arm-poky-linux/bin
43fi 43fi
44 44
45if [ "$MACHINE" == "qemux86" ]; then 45if [ "$MACHINE" = "qemux86" ]; then
46 QEMU=`which qemu` 46 QEMU=`which qemu`
47 if [ "x$ZIMAGE" == "x" ]; then 47 if [ "x$ZIMAGE" = "x" ]; then
48 ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin 48 ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin
49 fi 49 fi
50 CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin 50 CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin
@@ -65,34 +65,34 @@ else
65 echo "Warning: distccd not present, no distcc support loaded" 65 echo "Warning: distccd not present, no distcc support loaded"
66fi 66fi
67 67
68if [ "$MACHINE" == "qemuarm" ]; then 68if [ "$MACHINE" = "qemuarm" ]; then
69 if [ "$TYPE" == "ext2" ]; then 69 if [ "$TYPE" = "ext2" ]; then
70 if [ "x$HDIMAGE" == "x" ]; then 70 if [ "x$HDIMAGE" = "x" ]; then
71 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-sdk-qemuarm.ext2 71 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-sdk-qemuarm.ext2
72 fi 72 fi
73 QEMUOPTIONS="-append \"root=/dev/sda mem=$QEMU_MEMORY\" $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet" 73 QEMUOPTIONS="-append \"root=/dev/sda mem=$QEMU_MEMORY\" $QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet"
74 fi 74 fi
75 if [ "$TYPE" == "nfs" ]; then 75 if [ "$TYPE" = "nfs" ]; then
76 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192 76 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192
77 QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/qemuarm rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb -hda /tmp/blank" 77 QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/qemuarm rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb -hda /tmp/blank"
78 fi 78 fi
79fi 79fi
80 80
81if [ "$MACHINE" == "qemux86" ]; then 81if [ "$MACHINE" = "qemux86" ]; then
82 if [ "$TYPE" == "ext2" ]; then 82 if [ "$TYPE" = "ext2" ]; then
83 if [ "x$HDIMAGE" == "x" ]; then 83 if [ "x$HDIMAGE" = "x" ]; then
84 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemux86.ext2 84 HDIMAGE=$BUILDDIR/tmp/deploy/images/oh-image-pda-qemux86.ext2
85 fi 85 fi
86 # video=vesafb:1024x768-32@86 86 # video=vesafb:1024x768-32@86
87 QEMUOPTIONS="-std-vga -append \"root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" 87 QEMUOPTIONS="-std-vga -append \"root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
88 fi 88 fi
89 if [ "$TYPE" == "nfs" ]; then 89 if [ "$TYPE" = "nfs" ]; then
90 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192 90 dd if=/dev/zero of=/tmp/blank bs=1024 count=8192
91 QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/qemux86 rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -hda /tmp/blank" 91 QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:/srv/nfs/qemux86 rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -hda /tmp/blank"
92 fi 92 fi
93fi 93fi
94 94
95if [ "x$QEMUOPTIONS" == "x" ]; then 95if [ "x$QEMUOPTIONS" = "x" ]; then
96 echo "Sorry, unable to support this configuration" 96 echo "Sorry, unable to support this configuration"
97 exit 1 97 exit 1
98fi 98fi