summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-01-17 16:36:32 (GMT)
committerRoss Burton <ross@openedhand.com>2007-01-17 16:36:32 (GMT)
commite0c47a055ce21b82499a2c686b1e835c91fdc0f9 (patch)
tree1c26920c297946041c33764589d01dc0be2bc493
parent3408e51a6eb769a3fc48a9cda14308f3a1fed996 (diff)
downloadpoky-e0c47a055ce21b82499a2c686b1e835c91fdc0f9.tar.gz
Remove newlines in echos
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1160 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xscripts/poky-qemu2
-rwxr-xr-xscripts/poky-qemu-internal14
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu
index caac03c..c74a16f 100755
--- a/scripts/poky-qemu
+++ b/scripts/poky-qemu
@@ -18,7 +18,7 @@
18 18
19if [ "x$1" = "x" ]; then 19if [ "x$1" = "x" ]; then
20 MYNAME=`basename $0` 20 MYNAME=`basename $0`
21 echo -e "\nRun as MACHINE=xyz $MYNAME ZIMAGE IMAGEFILE" 21 echo "Run as MACHINE=xyz $MYNAME ZIMAGE IMAGEFILE"
22 echo "where:" 22 echo "where:"
23 echo " ZIMAGE - the kernel image file to use" 23 echo " ZIMAGE - the kernel image file to use"
24 echo " IMAGEFILE - the image file/location to use" 24 echo " IMAGEFILE - the image file/location to use"
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index e13f1b6..a88f52a 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -41,17 +41,17 @@ if [ "x$SERIAL_LOGFILE" != "x" ]; then
41fi 41fi
42 42
43if [ "$TYPE" != "nfs" -a ! -f "$HDIMAGE" ]; then 43if [ "$TYPE" != "nfs" -a ! -f "$HDIMAGE" ]; then
44 echo -e "\nError, image file $HDIMAGE doesn't exist" 44 echo "Error, image file $HDIMAGE doesn't exist"
45 exit 1 45 exit 1
46fi 46fi
47 47
48if [ ! -f "$ZIMAGE" ]; then 48if [ ! -f "$ZIMAGE" ]; then
49 echo -e "\nError, kernel image file $ZIMAGE doesn't exist" 49 echo "Error, kernel image file $ZIMAGE doesn't exist"
50 exit 1 50 exit 1
51fi 51fi
52 52
53if [ "$MACHINE" != "qemuarm" -a "$MACHINE" != "qemux86" ]; then 53if [ "$MACHINE" != "qemuarm" -a "$MACHINE" != "qemux86" ]; then
54 echo -e "\nError, unsupported machine type $MACHINE" 54 echo "Error, unsupported machine type $MACHINE"
55 exit 1 55 exit 1
56fi 56fi
57 57
@@ -65,7 +65,7 @@ if [ "$MACHINE" = "qemuarm" ]; then
65 HDIMAGE=/srv/nfs/qemuarm 65 HDIMAGE=/srv/nfs/qemuarm
66 fi 66 fi
67 if [ ! -d "$HDIMAGE" ]; then 67 if [ ! -d "$HDIMAGE" ]; then
68 echo -e "\nError, NFS mount point $HDIMAGE doesn't exist" 68 echo "Error, NFS mount point $HDIMAGE doesn't exist"
69 exit 1 69 exit 1
70 fi 70 fi
71 QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb" 71 QEMUOPTIONS="-append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD -M versatilepb"
@@ -82,7 +82,7 @@ if [ "$MACHINE" = "qemux86" ]; then
82 HDIMAGE=/srv/nfs/qemux86 82 HDIMAGE=/srv/nfs/qemux86
83 fi 83 fi
84 if [ ! -d "$HDIMAGE" ]; then 84 if [ ! -d "$HDIMAGE" ]; then
85 echo -e "\nError, NFS mount point $HDIMAGE doesn't exist." 85 echo "Error, NFS mount point $HDIMAGE doesn't exist."
86 exit 1 86 exit 1
87 fi 87 fi
88 QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD" 88 QEMUOPTIONS="-std-vga -append \"root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD\" $QEMU_NETWORK_CMD"
@@ -118,11 +118,11 @@ if [ "$MACHINE" = "akita" ]; then
118fi 118fi
119 119
120if [ "x$QEMUOPTIONS" = "x" ]; then 120if [ "x$QEMUOPTIONS" = "x" ]; then
121 echo -e "\nError, unable to support this combination of options" 121 echo "Error, unable to support this combination of options"
122 exit 1 122 exit 1
123fi 123fi
124 124
125echo -e "\nRunning $QEMU using sudo..." 125echo "Running $QEMU using sudo..."
126echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS" 126echo "$QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS"
127sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS 127sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS
128 128