summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-07-05 22:40:07 +0000
committerRichard Purdie <richard@openedhand.com>2007-07-05 22:40:07 +0000
commita5e790a6fcc38b04054897dc6514b32e28212f6d (patch)
treef7e01035802c19f6f64f9cc7825b224ed3a96e27
parente5379100d5d8caf15f95ae5a531fb2833dbfa734 (diff)
downloadopenembedded-core-a5e790a6fcc38b04054897dc6514b32e28212f6d.tar.gz
openembedded-core-a5e790a6fcc38b04054897dc6514b32e28212f6d.tar.bz2
openembedded-core-a5e790a6fcc38b04054897dc6514b32e28212f6d.tar.xz
openembedded-core-a5e790a6fcc38b04054897dc6514b32e28212f6d.zip
runqemu: Use pda image if sdk image not available for qemu machines
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2120 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xscripts/poky-env-internal4
-rwxr-xr-xscripts/runqemu14
2 files changed, 14 insertions, 4 deletions
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index b1e5546bb..93a1400f0 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -26,7 +26,7 @@ OEROOT=`pwd`
BBDIR=$OEROOT/bitbake/
PKGDIR=$OEROOT/meta/
-BUILDDIR=$OEROOT/build/
+BUILDDIR=$OEROOT/$1/
MSG=''
BUILD_ARCH=`uname -m`
@@ -55,7 +55,7 @@ BBPATH=$BBDIR
if test x"$BBDIR" != x"$PKGDIR"; then
BBPATH=$PKGDIR:$BBPATH
fi
-BBPATH="`readlink -f $HOME/.oe`:`readlink -f $HOME/.poky`:$BBPATH"
+BBPATH="`readlink -f $HOME/.oe`:`readlink -f $HOME/.poky`:$BBPATH:$OEROOT/poky-prvt/trunk"
if test x"$PKGDIR" != x"$BUILDDIR"; then
BBPATH=$BUILDDIR:$BBPATH
fi
diff --git a/scripts/runqemu b/scripts/runqemu
index a3bb777bb..c8546ddad 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -68,7 +68,12 @@ fi
if [ "$MACHINE" = "qemuarm" ]; then
if [ "$TYPE" = "ext2" ]; then
if [ "x$HDIMAGE" = "x" ]; then
- HDIMAGE=$BUILDDIR/tmp/deploy/images/poky-image-sdk-qemuarm.ext2
+ T=$BUILDDIR/tmp/deploy/images/poky-image-
+ if [ -x "$T-sdk-qemuarm.ext2" ]; then
+ HDIMAGE=$T-sdk-qemuarm.ext2
+ elif [ -x "$T-pda-qemuarm.ext2" ]; then
+ HDIMAGE=$T-pda-qemuarm.ext2
+ fi
fi
fi
fi
@@ -95,7 +100,12 @@ if [ "$MACHINE" = "qemux86" ]; then
fi
if [ "$TYPE" = "ext2" ]; then
if [ "x$HDIMAGE" = "x" ]; then
- HDIMAGE=$BUILDDIR/tmp/deploy/images/poky-image-sdk-qemux86.ext2
+ T=$BUILDDIR/tmp/deploy/images/poky-image-
+ if [ -x "$T-sdk-qemux86.ext2" ]; then
+ HDIMAGE=$T-sdk-qemux86.ext2
+ elif [ -x "$T-pda-qemux86.ext2" ]; then
+ HDIMAGE=$T-pda-qemux86.ext2
+ fi
fi
fi
CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin