diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-10 12:15:48 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-10 12:15:48 +0100 |
commit | de687629d89740d8f748f8a0b11650e5649c66e4 (patch) | |
tree | d55659eb3ea48036aa11fbd55b0a5589e34a174f | |
parent | 824dce8d18f753af1caeeb65fcd581d7cff41205 (diff) | |
download | poky-de687629d89740d8f748f8a0b11650e5649c66e4.tar.gz |
scripts: Update qemux86 to use the vmmouse driver, not wacom and find moblin images
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rwxr-xr-x | scripts/poky-qemu-internal | 4 | ||||
-rwxr-xr-x | scripts/runqemu | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index 685d8d7a23..3cc7a70256 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal | |||
@@ -115,7 +115,7 @@ if [ "$MACHINE" = "qemux86" ]; then | |||
115 | QEMU=qemu | 115 | QEMU=qemu |
116 | if [ "$TYPE" = "ext3" ]; then | 116 | if [ "$TYPE" = "ext3" ]; then |
117 | KERNCMDLINE="vga=0 root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" | 117 | KERNCMDLINE="vga=0 root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" |
118 | QEMUOPTIONS="-vga vmware $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet -enable-gl" | 118 | QEMUOPTIONS="-vga vmware $QEMU_NETWORK_CMD -hda $HDIMAGE -enable-gl" |
119 | fi | 119 | fi |
120 | if [ "$TYPE" = "nfs" ]; then | 120 | if [ "$TYPE" = "nfs" ]; then |
121 | if [ "x$HDIMAGE" = "x" ]; then | 121 | if [ "x$HDIMAGE" = "x" ]; then |
@@ -126,7 +126,7 @@ if [ "$MACHINE" = "qemux86" ]; then | |||
126 | return | 126 | return |
127 | fi | 127 | fi |
128 | KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 128 | KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
129 | QEMUOPTIONS="-vga std -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD" | 129 | QEMUOPTIONS="-vga std $QEMU_NETWORK_CMD" |
130 | fi | 130 | fi |
131 | fi | 131 | fi |
132 | 132 | ||
diff --git a/scripts/runqemu b/scripts/runqemu index 7d5107f144..eaee811187 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -134,7 +134,7 @@ if [ "$MACHINE" = "qemux86" ]; then | |||
134 | if [ "$TYPE" = "ext3" ]; then | 134 | if [ "$TYPE" = "ext3" ]; then |
135 | if [ "x$HDIMAGE" = "x" ]; then | 135 | if [ "x$HDIMAGE" = "x" ]; then |
136 | T=$BUILDDIR/tmp/deploy/images | 136 | T=$BUILDDIR/tmp/deploy/images |
137 | findimage $T qemux86 ext3 "poky-image-sdk poky-image-sato poky-image-minimal moblin-image-netbook" | 137 | findimage $T qemux86 ext3 "molbin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal" |
138 | fi | 138 | fi |
139 | fi | 139 | fi |
140 | CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin | 140 | CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin |