summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <saul.wold@intel.com>2010-07-21 21:49:09 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-21 21:49:09 +0100
commit0c3b1aa0a5461c9b5f3833feb091f7c8a459ca9b (patch)
tree06d349651c93943951522fb19f07e39e6e8e3754
parent1df4e34d141cbbeeb8c93a36e5d4224ac06bb539 (diff)
downloadpoky-0c3b1aa0a5461c9b5f3833feb091f7c8a459ca9b.tar.gz
scripts/runqemu: Path fixes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rwxr-xr-xscripts/runqemu28
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index bb26f8b633..82fc4e93b7 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -35,7 +35,7 @@ if ! (test -d "$TMPDIR"); then
35fi 35fi
36 36
37SCRIPTSDIR=`dirname "$0"` 37SCRIPTSDIR=`dirname "$0"`
38INTERNAL_SCRIPT=SCRIPTSDIR/poky-qemu-internal` 38INTERNAL_SCRIPT=$SCRIPTSDIR/poky-qemu-internal
39 39
40if [ "x$1" = "x" ]; then 40if [ "x$1" = "x" ]; then
41 echo 41 echo
@@ -116,34 +116,34 @@ fi
116 116
117if [ "$MACHINE" = "qemumips" ]; then 117if [ "$MACHINE" = "qemumips" ]; then
118 if [ "x$ZIMAGE" = "x" ]; then 118 if [ "x$ZIMAGE" = "x" ]; then
119 ZIMAGE=$TMPDIR/tmp/deploy/images/vmlinux-$MACHINE.bin 119 ZIMAGE=$TMPDIR/deploy/images/vmlinux-$MACHINE.bin
120 fi 120 fi
121 if [ "$TYPE" = "ext3" ]; then 121 if [ "$TYPE" = "ext3" ]; then
122 if [ "x$HDIMAGE" = "x" ]; then 122 if [ "x$HDIMAGE" = "x" ]; then
123 T=$TMPDIR/tmp/deploy/images 123 T=$TMPDIR/deploy/images
124 findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-minimal" 124 findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-minimal"
125 fi 125 fi
126 fi 126 fi
127 CROSSPATH=$TMPDIR/tmp/sysroots/$BUILD_SYS/usr 127 CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
128fi 128fi
129 129
130if [ "$MACHINE" = "qemuppc" ]; then 130if [ "$MACHINE" = "qemuppc" ]; then
131 if [ "x$ZIMAGE" = "x" ]; then 131 if [ "x$ZIMAGE" = "x" ]; then
132 ZIMAGE=$TMPDIR/tmp/deploy/images/zImage-$MACHINE.bin 132 ZIMAGE=$TMPDIR/deploy/images/zImage-$MACHINE.bin
133 fi 133 fi
134 if [ "$TYPE" = "ext3" ]; then 134 if [ "$TYPE" = "ext3" ]; then
135 if [ "x$HDIMAGE" = "x" ]; then 135 if [ "x$HDIMAGE" = "x" ]; then
136 T=$TMPDIR/tmp/deploy/images 136 T=$TMPDIR/deploy/images
137 findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-minimal" 137 findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-minimal"
138 fi 138 fi
139 fi 139 fi
140 CROSSPATH=$TMPDIR/tmp/sysroots/$BUILD_SYS/usr 140 CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
141fi 141fi
142 142
143if [ "$MACHINE" = "spitz" ]; then 143if [ "$MACHINE" = "spitz" ]; then
144 if [ "$TYPE" = "ext3" ]; then 144 if [ "$TYPE" = "ext3" ]; then
145 if [ "x$HDIMAGE" = "x" ]; then 145 if [ "x$HDIMAGE" = "x" ]; then
146 HDIMAGE=$TMPDIR/tmp/deploy/images/poky-image-sato-spitz.ext3 146 HDIMAGE=$TMPDIR/deploy/images/poky-image-sato-spitz.ext3
147 fi 147 fi
148 fi 148 fi
149fi 149fi
@@ -151,7 +151,7 @@ fi
151if [ "$MACHINE" = "akita" ]; then 151if [ "$MACHINE" = "akita" ]; then
152 if [ "$TYPE" = "jffs2" ]; then 152 if [ "$TYPE" = "jffs2" ]; then
153 if [ "x$HDIMAGE" = "x" ]; then 153 if [ "x$HDIMAGE" = "x" ]; then
154 HDIMAGE=$TMPDIR/tmp/deploy/images/poky-image-sato-akita.jffs2 154 HDIMAGE=$TMPDIR/deploy/images/poky-image-sato-akita.jffs2
155 fi 155 fi
156 fi 156 fi
157fi 157fi
@@ -159,7 +159,7 @@ fi
159if [ "$MACHINE" = "nokia800" ]; then 159if [ "$MACHINE" = "nokia800" ]; then
160 if [ "$TYPE" = "jffs2" ]; then 160 if [ "$TYPE" = "jffs2" ]; then
161 if [ "x$HDIMAGE" = "x" ]; then 161 if [ "x$HDIMAGE" = "x" ]; then
162 HDIMAGE=$TMPDIR/tmp/deploy/images/poky-image-sato-nokia800.jffs2 162 HDIMAGE=$TMPDIR/deploy/images/poky-image-sato-nokia800.jffs2
163 fi 163 fi
164 fi 164 fi
165fi 165fi
@@ -167,15 +167,15 @@ fi
167 167
168if [ "$MACHINE" = "qemux86" ]; then 168if [ "$MACHINE" = "qemux86" ]; then
169 if [ "x$ZIMAGE" = "x" ]; then 169 if [ "x$ZIMAGE" = "x" ]; then
170 ZIMAGE=$TMPDIR/tmp/deploy/images/bzImage-$MACHINE.bin 170 ZIMAGE=$TMPDIR/deploy/images/bzImage-$MACHINE.bin
171 fi 171 fi
172 if [ "$TYPE" = "ext3" ]; then 172 if [ "$TYPE" = "ext3" ]; then
173 if [ "x$HDIMAGE" = "x" ]; then 173 if [ "x$HDIMAGE" = "x" ]; then
174 T=$TMPDIR/tmp/deploy/images 174 T=$TMPDIR/deploy/images
175 findimage $T qemux86 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal" 175 findimage $T qemux86 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
176 fi 176 fi
177 fi 177 fi
178 CROSSPATH=$TMPDIR/tmp/sysroots/$BUILD_SYS/usr 178 CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
179fi 179fi
180 180
181if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then 181if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o "$MACHINE" = "akita" -o "$MACHINE" = "nokia800" ]; then
@@ -194,6 +194,6 @@ if [ ! -e $CROSSPATH/$TARGET_SYS/bin/gcc ]; then
194 ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/$TARGET_SYS/bin/gcc 194 ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/$TARGET_SYS/bin/gcc
195fi 195fi
196 196
197CROSSPATH=$TMPDIR/tmp/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH:$TMPDIR/tmp/cross/bin 197CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH:$TMPDIR/cross/bin
198 198
199. $INTERNAL_SCRIPT 199. $INTERNAL_SCRIPT