diff options
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-x | scripts/runqemu-internal | 22 |
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 |
481 | fi | 480 | fi |
482 | 481 | ||
483 | if [ "x$CROSSPATH" = "x" ]; then | 482 | PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$PATH |
484 | PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$PATH | ||
485 | else | ||
486 | PATH=$CROSSPATH:$OECORE_NATIVE_SYSROOT/usr/bin:$PATH | ||
487 | fi | ||
488 | 483 | ||
489 | QEMUBIN=`which $QEMU 2> /dev/null` | 484 | QEMUBIN=`which $QEMU 2> /dev/null` |
490 | if [ ! -x "$QEMUBIN" ]; then | 485 | if [ ! -x "$QEMUBIN" ]; then |
@@ -511,27 +506,12 @@ if [ "$NEED_GL" != "" ]; then | |||
511 | fi | 506 | fi |
512 | 507 | ||
513 | do_quit() { | 508 | do_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 | ||
522 | DISTCCD=`which distccd 2> /dev/null` | ||
523 | PIDFILE="" | ||
524 | |||
525 | trap do_quit INT TERM QUIT | 513 | trap do_quit INT TERM QUIT |
526 | 514 | ||
527 | if [ -x "$DISTCCD" ]; then | ||
528 | echo "Starting distccd..." | ||
529 | PIDFILE=`mktemp` | ||
530 | $DISTCCD --allow 192.168.7.2 --daemon --pid-file $PIDFILE & | ||
531 | else | ||
532 | echo "WARNING: distccd not present, no distcc support loaded." | ||
533 | fi | ||
534 | |||
535 | # qemu got segfault if linked with nVidia's libgl | 515 | # qemu got segfault if linked with nVidia's libgl |
536 | GL_LD_PRELOAD=$LD_PRELOAD | 516 | GL_LD_PRELOAD=$LD_PRELOAD |
537 | 517 | ||