diff options
author | Richard Purdie <richard@openedhand.com> | 2008-01-31 17:42:44 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2008-01-31 17:42:44 +0000 |
commit | d0dae3b6166027eea33dd03e5fa3a02e35140728 (patch) | |
tree | 4b53aca3a2f4b2a5451954ed2f89bc0fbd890020 | |
parent | 4592a9b58ce6df99a7b8e0ad022ceef374211db3 (diff) | |
download | poky-d0dae3b6166027eea33dd03e5fa3a02e35140728.tar.gz |
scripts: Always try to start distccd, improve distccd cleanup, add SDK directory to the search path so any cross compiler installed in /usr/local/poky is found and used, add ifdown script to avoid warning messages
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3649 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-x | scripts/poky-qemu | 4 | ||||
-rwxr-xr-x | scripts/poky-qemu-ifdown | 27 | ||||
-rwxr-xr-x | scripts/poky-qemu-internal | 29 | ||||
-rwxr-xr-x | scripts/runqemu | 17 |
4 files changed, 62 insertions, 15 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu index 6b8224ba6d..1c680b11f1 100755 --- a/scripts/poky-qemu +++ b/scripts/poky-qemu | |||
@@ -49,4 +49,8 @@ else | |||
49 | fi | 49 | fi |
50 | 50 | ||
51 | INTERNAL_SCRIPT=`which poky-qemu-internal` | 51 | INTERNAL_SCRIPT=`which poky-qemu-internal` |
52 | |||
53 | SDKDIR=/usr/local/poky/eabi-glibc/arm/bin/ | ||
54 | PATH=$SDKDIR:$PATH | ||
55 | |||
52 | . $INTERNAL_SCRIPT | 56 | . $INTERNAL_SCRIPT |
diff --git a/scripts/poky-qemu-ifdown b/scripts/poky-qemu-ifdown new file mode 100755 index 0000000000..2212353118 --- /dev/null +++ b/scripts/poky-qemu-ifdown | |||
@@ -0,0 +1,27 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # QEMU network interface configuration script | ||
4 | # | ||
5 | # Copyright (C) 2006-2007 OpenedHand Ltd. | ||
6 | # | ||
7 | # This program is free software; you can redistribute it and/or modify | ||
8 | # it under the terms of the GNU General Public License version 2 as | ||
9 | # published by the Free Software Foundation. | ||
10 | # | ||
11 | # This program is distributed in the hope that it will be useful, | ||
12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | # GNU General Public License for more details. | ||
15 | # | ||
16 | # You should have received a copy of the GNU General Public License along | ||
17 | # with this program; if not, write to the Free Software Foundation, Inc., | ||
18 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
19 | |||
20 | |||
21 | IFCONFIG=`which ifconfig` | ||
22 | if [ "x$IFCONFIG" = "x" ]; then | ||
23 | # better than nothing... | ||
24 | IFCONFIG=/sbin/ifconfig | ||
25 | fi | ||
26 | |||
27 | $IFCONFIG tap0 down | ||
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index d96b67e38a..ceb6afdbf3 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal | |||
@@ -30,8 +30,9 @@ | |||
30 | # | 30 | # |
31 | 31 | ||
32 | QEMUIFUP=`which poky-qemu-ifup` | 32 | QEMUIFUP=`which poky-qemu-ifup` |
33 | QEMUIFDOWN=`which poky-qemu-ifdown` | ||
33 | KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0" | 34 | KERNEL_NETWORK_CMD="ip=192.168.7.2::192.168.7.1:255.255.255.0" |
34 | QEMU_NETWORK_CMD="-net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$QEMUIFUP" | 35 | QEMU_NETWORK_CMD="-net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=$QEMUIFUP,downscript=$QEMUIFDOWN" |
35 | KERNCMDLINE="mem=$QEMU_MEMORY" | 36 | KERNCMDLINE="mem=$QEMU_MEMORY" |
36 | 37 | ||
37 | if [ -z "$QEMU_MEMORY" ]; then | 38 | if [ -z "$QEMU_MEMORY" ]; then |
@@ -127,6 +128,30 @@ if [ "x$QEMUOPTIONS" = "x" ]; then | |||
127 | return | 128 | return |
128 | fi | 129 | fi |
129 | 130 | ||
131 | function _quit() { | ||
132 | if [ -n "$PIDFILE" ]; then | ||
133 | echo kill `cat $PIDFILE` | ||
134 | kill `cat $PIDFILE` | ||
135 | fi | ||
136 | return | ||
137 | } | ||
138 | |||
139 | DISTCCD=`which distccd` | ||
140 | PIDFILE="" | ||
141 | |||
142 | trap _quit INT TERM QUIT | ||
143 | |||
144 | if [ -x "$DISTCCD" ]; then | ||
145 | echo "Starting distccd..." | ||
146 | PIDFILE=`mktemp` | ||
147 | $DISTCCD --allow 192.168.7.2 --daemon --pid-file $PIDFILE & | ||
148 | else | ||
149 | echo "Warning: distccd not present, no distcc support loaded." | ||
150 | fi | ||
151 | |||
130 | echo "Running $QEMU using sudo..." | 152 | echo "Running $QEMU using sudo..." |
131 | echo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS --append "$KERNCMDLINE" | 153 | echo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS --append "$KERNCMDLINE" |
132 | sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS --append "$KERNCMDLINE" | 154 | sudo $QEMU -kernel $ZIMAGE $QEMUOPTIONS $SERIALOPTS --append "$KERNCMDLINE" || /bin/true |
155 | |||
156 | trap - INT TERM QUIT | ||
157 | return | ||
diff --git a/scripts/runqemu b/scripts/runqemu index 263a1d4ddb..0176e636a8 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -23,7 +23,10 @@ if [ "x$BUILDDIR" = "x" ]; then | |||
23 | exit 1 | 23 | exit 1 |
24 | fi | 24 | fi |
25 | 25 | ||
26 | PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/usr/bin:$BUILDDIR/tmp/cross/bin:$PATH | 26 | INTERNAL_SCRIPT=`which poky-qemu-internal` |
27 | |||
28 | SDKDIR=/usr/local/poky/eabi-glibc/arm/bin/ | ||
29 | PATH=$BUILDDIR/tmp/staging/$BUILD_SYS/usr/bin:$BUILDDIR/tmp/cross/bin:$SDKDIR:$PATH | ||
27 | 30 | ||
28 | if [ "x$1" = "x" ]; then | 31 | if [ "x$1" = "x" ]; then |
29 | echo | 32 | echo |
@@ -121,17 +124,5 @@ if [ ! -e $CROSSPATH/cc ]; then | |||
121 | ln -s $CROSSPATH/gcc $CROSSPATH/cc | 124 | ln -s $CROSSPATH/gcc $CROSSPATH/cc |
122 | fi | 125 | fi |
123 | 126 | ||
124 | DISTCCD=`which distccd` | ||
125 | |||
126 | if [ -x "$DISTCCD" ]; then | ||
127 | $DISTCCD --allow 192.168.7.2 --daemon | ||
128 | else | ||
129 | echo "Warning: distccd not present, no distcc support loaded" | ||
130 | fi | ||
131 | |||
132 | INTERNAL_SCRIPT=`which poky-qemu-internal` | ||
133 | . $INTERNAL_SCRIPT | 127 | . $INTERNAL_SCRIPT |
134 | 128 | ||
135 | if [ -x "$DISTCCD" ]; then | ||
136 | killall distccd | ||
137 | fi | ||