aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-01-16 12:35:15 +0000
committerRichard Purdie <richard@openedhand.com>2007-01-16 12:35:15 +0000
commit6531611d9a02ebee72229ee475601a5717222e56 (patch)
treeff6e616e4471086fdb2c02c1815b5cfef6bd4123
parent295818470acd4628df8c5de20a8843cb90171b5b (diff)
downloadpoky-6531611d9a02ebee72229ee475601a5717222e56.tar.gz
poky-6531611d9a02ebee72229ee475601a5717222e56.tar.bz2
poky-6531611d9a02ebee72229ee475601a5717222e56.zip
runqemu: Tweak scripts
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1145 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xscripts/runqemu7
-rwxr-xr-x[-rw-r--r--]scripts/runqemu-internal0
-rwxr-xr-xscripts/runqemu-standalone3
3 files changed, 4 insertions, 6 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 433ceb7e35..30fd0697c6 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -23,10 +23,6 @@ fi
PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/bin:$BUILDDIR/tmp/cross/bin:$PATH
-if [ -z "$QEMU_MEMORY" ]; then
- QEMU_MEMORY="64M"
-fi
-
if [ "x$1" = "x" ]; then
echo
echo "Run as $0 MACHINE IMAGETYPE ZIMAGE IMAGEFILE"
@@ -96,7 +92,8 @@ else
echo "Warning: distccd not present, no distcc support loaded"
fi
-source $OEROOT/scripts/runqemu-internal
+INTERNAL_SCRIPT=`which runqemu-internal`
+source $INTERNAL_SCRIPT
if [ -x "$DISTCCD" ]; then
killall distccd
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 1ad0ef34b8..1ad0ef34b8 100644..100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
diff --git a/scripts/runqemu-standalone b/scripts/runqemu-standalone
index 6e8218331e..08829e933f 100755
--- a/scripts/runqemu-standalone
+++ b/scripts/runqemu-standalone
@@ -40,5 +40,6 @@ if [ "x$MACHINE" = "x" ]; then
MACHINE=`basename $ZIMAGE | sed -e 's#.*-\([a-z]*\)-*[0-9]*..*#\1#'`
fi
-source $OEROOT/scripts/runqemu-internal
+INTERNAL_SCRIPT=`which runqemu-internal`
+source $INTERNAL_SCRIPT