summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-01-16 12:35:15 (GMT)
committerRichard Purdie <richard@openedhand.com>2007-01-16 12:35:15 (GMT)
commit6531611d9a02ebee72229ee475601a5717222e56 (patch)
treeff6e616e4471086fdb2c02c1815b5cfef6bd4123
parent295818470acd4628df8c5de20a8843cb90171b5b (diff)
downloadpoky-6531611d9a02ebee72229ee475601a5717222e56.tar.gz
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 433ceb7..30fd069 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -23,10 +23,6 @@ fi
23 23
24PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/bin:$BUILDDIR/tmp/cross/bin:$PATH 24PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/bin:$BUILDDIR/tmp/cross/bin:$PATH
25 25
26if [ -z "$QEMU_MEMORY" ]; then
27 QEMU_MEMORY="64M"
28fi
29
30if [ "x$1" = "x" ]; then 26if [ "x$1" = "x" ]; then
31 echo 27 echo
32 echo "Run as $0 MACHINE IMAGETYPE ZIMAGE IMAGEFILE" 28 echo "Run as $0 MACHINE IMAGETYPE ZIMAGE IMAGEFILE"
@@ -96,7 +92,8 @@ else
96 echo "Warning: distccd not present, no distcc support loaded" 92 echo "Warning: distccd not present, no distcc support loaded"
97fi 93fi
98 94
99source $OEROOT/scripts/runqemu-internal 95INTERNAL_SCRIPT=`which runqemu-internal`
96source $INTERNAL_SCRIPT
100 97
101if [ -x "$DISTCCD" ]; then 98if [ -x "$DISTCCD" ]; then
102 killall distccd 99 killall distccd
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 1ad0ef3..1ad0ef3 100644..100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
diff --git a/scripts/runqemu-standalone b/scripts/runqemu-standalone
index 6e82183..08829e9 100755
--- a/scripts/runqemu-standalone
+++ b/scripts/runqemu-standalone
@@ -40,5 +40,6 @@ if [ "x$MACHINE" = "x" ]; then
40 MACHINE=`basename $ZIMAGE | sed -e 's#.*-\([a-z]*\)-*[0-9]*..*#\1#'` 40 MACHINE=`basename $ZIMAGE | sed -e 's#.*-\([a-z]*\)-*[0-9]*..*#\1#'`
41fi 41fi
42 42
43source $OEROOT/scripts/runqemu-internal 43INTERNAL_SCRIPT=`which runqemu-internal`
44source $INTERNAL_SCRIPT
44 45