summaryrefslogtreecommitdiffstats
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)
downloadpoky-a5e790a6fcc38b04054897dc6514b32e28212f6d.tar.gz
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 b1e5546bba..93a1400f0c 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -26,7 +26,7 @@ OEROOT=`pwd`
26 26
27BBDIR=$OEROOT/bitbake/ 27BBDIR=$OEROOT/bitbake/
28PKGDIR=$OEROOT/meta/ 28PKGDIR=$OEROOT/meta/
29BUILDDIR=$OEROOT/build/ 29BUILDDIR=$OEROOT/$1/
30MSG='' 30MSG=''
31 31
32BUILD_ARCH=`uname -m` 32BUILD_ARCH=`uname -m`
@@ -55,7 +55,7 @@ BBPATH=$BBDIR
55if test x"$BBDIR" != x"$PKGDIR"; then 55if test x"$BBDIR" != x"$PKGDIR"; then
56 BBPATH=$PKGDIR:$BBPATH 56 BBPATH=$PKGDIR:$BBPATH
57fi 57fi
58BBPATH="`readlink -f $HOME/.oe`:`readlink -f $HOME/.poky`:$BBPATH" 58BBPATH="`readlink -f $HOME/.oe`:`readlink -f $HOME/.poky`:$BBPATH:$OEROOT/poky-prvt/trunk"
59if test x"$PKGDIR" != x"$BUILDDIR"; then 59if test x"$PKGDIR" != x"$BUILDDIR"; then
60 BBPATH=$BUILDDIR:$BBPATH 60 BBPATH=$BUILDDIR:$BBPATH
61fi 61fi
diff --git a/scripts/runqemu b/scripts/runqemu
index a3bb777bbc..c8546ddadf 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -68,7 +68,12 @@ fi
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/poky-image-sdk-qemuarm.ext2 71 T=$BUILDDIR/tmp/deploy/images/poky-image-
72 if [ -x "$T-sdk-qemuarm.ext2" ]; then
73 HDIMAGE=$T-sdk-qemuarm.ext2
74 elif [ -x "$T-pda-qemuarm.ext2" ]; then
75 HDIMAGE=$T-pda-qemuarm.ext2
76 fi
72 fi 77 fi
73 fi 78 fi
74fi 79fi
@@ -95,7 +100,12 @@ if [ "$MACHINE" = "qemux86" ]; then
95 fi 100 fi
96 if [ "$TYPE" = "ext2" ]; then 101 if [ "$TYPE" = "ext2" ]; then
97 if [ "x$HDIMAGE" = "x" ]; then 102 if [ "x$HDIMAGE" = "x" ]; then
98 HDIMAGE=$BUILDDIR/tmp/deploy/images/poky-image-sdk-qemux86.ext2 103 T=$BUILDDIR/tmp/deploy/images/poky-image-
104 if [ -x "$T-sdk-qemux86.ext2" ]; then
105 HDIMAGE=$T-sdk-qemux86.ext2
106 elif [ -x "$T-pda-qemux86.ext2" ]; then
107 HDIMAGE=$T-pda-qemux86.ext2
108 fi
99 fi 109 fi
100 fi 110 fi
101 CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin 111 CROSSPATH=$BUILDDIR/tmp/cross/i586-poky-linux/bin