summaryrefslogtreecommitdiff
path: root/scripts/runqemu
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 /scripts/runqemu
parent1df4e34d141cbbeeb8c93a36e5d4224ac06bb539 (diff)
downloadopenembedded-core-0c3b1aa0a5461c9b5f3833feb091f7c8a459ca9b.tar.gz
openembedded-core-0c3b1aa0a5461c9b5f3833feb091f7c8a459ca9b.tar.bz2
openembedded-core-0c3b1aa0a5461c9b5f3833feb091f7c8a459ca9b.zip
scripts/runqemu: Path fixes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'scripts/runqemu')
-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
fi
SCRIPTSDIR=`dirname "$0"`
-INTERNAL_SCRIPT=SCRIPTSDIR/poky-qemu-internal`
+INTERNAL_SCRIPT=$SCRIPTSDIR/poky-qemu-internal
if [ "x$1" = "x" ]; then
echo
@@ -116,34 +116,34 @@ fi
if [ "$MACHINE" = "qemumips" ]; then
if [ "x$ZIMAGE" = "x" ]; then
- ZIMAGE=$TMPDIR/tmp/deploy/images/vmlinux-$MACHINE.bin
+ ZIMAGE=$TMPDIR/deploy/images/vmlinux-$MACHINE.bin
fi
if [ "$TYPE" = "ext3" ]; then
if [ "x$HDIMAGE" = "x" ]; then
- T=$TMPDIR/tmp/deploy/images
+ T=$TMPDIR/deploy/images
findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-minimal"
fi
fi
- CROSSPATH=$TMPDIR/tmp/sysroots/$BUILD_SYS/usr
+ CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
fi
if [ "$MACHINE" = "qemuppc" ]; then
if [ "x$ZIMAGE" = "x" ]; then
- ZIMAGE=$TMPDIR/tmp/deploy/images/zImage-$MACHINE.bin
+ ZIMAGE=$TMPDIR/deploy/images/zImage-$MACHINE.bin
fi
if [ "$TYPE" = "ext3" ]; then
if [ "x$HDIMAGE" = "x" ]; then
- T=$TMPDIR/tmp/deploy/images
+ T=$TMPDIR/deploy/images
findimage $T $MACHINE ext3 "poky-image-sdk poky-image-sato poky-image-minimal"
fi
fi
- CROSSPATH=$TMPDIR/tmp/sysroots/$BUILD_SYS/usr
+ CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
fi
if [ "$MACHINE" = "spitz" ]; then
if [ "$TYPE" = "ext3" ]; then
if [ "x$HDIMAGE" = "x" ]; then
- HDIMAGE=$TMPDIR/tmp/deploy/images/poky-image-sato-spitz.ext3
+ HDIMAGE=$TMPDIR/deploy/images/poky-image-sato-spitz.ext3
fi
fi
fi
@@ -151,7 +151,7 @@ fi
if [ "$MACHINE" = "akita" ]; then
if [ "$TYPE" = "jffs2" ]; then
if [ "x$HDIMAGE" = "x" ]; then
- HDIMAGE=$TMPDIR/tmp/deploy/images/poky-image-sato-akita.jffs2
+ HDIMAGE=$TMPDIR/deploy/images/poky-image-sato-akita.jffs2
fi
fi
fi
@@ -159,7 +159,7 @@ fi
if [ "$MACHINE" = "nokia800" ]; then
if [ "$TYPE" = "jffs2" ]; then
if [ "x$HDIMAGE" = "x" ]; then
- HDIMAGE=$TMPDIR/tmp/deploy/images/poky-image-sato-nokia800.jffs2
+ HDIMAGE=$TMPDIR/deploy/images/poky-image-sato-nokia800.jffs2
fi
fi
fi
@@ -167,15 +167,15 @@ fi
if [ "$MACHINE" = "qemux86" ]; then
if [ "x$ZIMAGE" = "x" ]; then
- ZIMAGE=$TMPDIR/tmp/deploy/images/bzImage-$MACHINE.bin
+ ZIMAGE=$TMPDIR/deploy/images/bzImage-$MACHINE.bin
fi
if [ "$TYPE" = "ext3" ]; then
if [ "x$HDIMAGE" = "x" ]; then
- T=$TMPDIR/tmp/deploy/images
+ T=$TMPDIR/deploy/images
findimage $T qemux86 ext3 "moblin-image-sdk moblin-image-netbook poky-image-sdk poky-image-sato poky-image-minimal"
fi
fi
- CROSSPATH=$TMPDIR/tmp/sysroots/$BUILD_SYS/usr
+ CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr
fi
if [ "$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
ln -s $CROSSPATH/bin/$TARGET_SYS-gcc $CROSSPATH/$TARGET_SYS/bin/gcc
fi
-CROSSPATH=$TMPDIR/tmp/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH:$TMPDIR/tmp/cross/bin
+CROSSPATH=$TMPDIR/sysroots/$BUILD_SYS/usr/bin:$CROSSPATH:$TMPDIR/cross/bin
. $INTERNAL_SCRIPT