summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-16 11:31:56 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-16 12:39:57 +0100
commit4f2b84081ab4444e8d293e503a362e54f3bcc159 (patch)
tree1d48f3faf88c78fb109bc26c8bdf75f07d8f06b7
parent17eff0796cc7959ee934af1dbbddb8645d2302d1 (diff)
downloadpoky-4f2b84081ab4444e8d293e503a362e54f3bcc159.tar.gz
runqemu-internal: Drop distcc support
The distcc support is clearly unused and broken, might as well drop the remaining code fragements. (From OE-Core rev: 1a70a3225947aa45f3e1f377d50a5865aac64d2b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu-internal22
1 files changed, 1 insertions, 21 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index c7e4c5c7e2..f11706d7e7 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -20,7 +20,6 @@
20# Call setting: 20# Call setting:
21# QEMU_MEMORY (optional) - set the amount of memory in the emualted system. 21# QEMU_MEMORY (optional) - set the amount of memory in the emualted system.
22# SERIAL_LOGFILE (optional) - log the serial port output to a file 22# SERIAL_LOGFILE (optional) - log the serial port output to a file
23# CROSSPATH - the path to any cross toolchain to use with distcc
24# 23#
25# Image options: 24# Image options:
26# MACHINE - the machine to run 25# MACHINE - the machine to run
@@ -480,11 +479,7 @@ if [ "x$QEMUOPTIONS" = "x" ]; then
480 return 1 479 return 1
481fi 480fi
482 481
483if [ "x$CROSSPATH" = "x" ]; then 482PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$PATH
484 PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$PATH
485else
486 PATH=$CROSSPATH:$OECORE_NATIVE_SYSROOT/usr/bin:$PATH
487fi
488 483
489QEMUBIN=`which $QEMU 2> /dev/null` 484QEMUBIN=`which $QEMU 2> /dev/null`
490if [ ! -x "$QEMUBIN" ]; then 485if [ ! -x "$QEMUBIN" ]; then
@@ -511,27 +506,12 @@ if [ "$NEED_GL" != "" ]; then
511fi 506fi
512 507
513do_quit() { 508do_quit() {
514 if [ -n "$PIDFILE" ]; then
515 #echo kill `cat $PIDFILE`
516 kill `cat $PIDFILE`
517 fi
518 cleanup 509 cleanup
519 return 1 510 return 1
520} 511}
521 512
522DISTCCD=`which distccd 2> /dev/null`
523PIDFILE=""
524
525trap do_quit INT TERM QUIT 513trap do_quit INT TERM QUIT
526 514
527if [ -x "$DISTCCD" ]; then
528 echo "Starting distccd..."
529 PIDFILE=`mktemp`
530 $DISTCCD --allow 192.168.7.2 --daemon --pid-file $PIDFILE &
531else
532 echo "WARNING: distccd not present, no distcc support loaded."
533fi
534
535# qemu got segfault if linked with nVidia's libgl 515# qemu got segfault if linked with nVidia's libgl
536GL_LD_PRELOAD=$LD_PRELOAD 516GL_LD_PRELOAD=$LD_PRELOAD
537 517