Mercurial > hg > aboriginal
comparison sources/toys/dev-environment.sh @ 1735:34f7ca02767c draft
Fix distccd launch.
author | Rob Landley <rob@landley.net> |
---|---|
date | Sun, 15 Feb 2015 17:39:12 -0600 |
parents | b89324905ca2 |
children |
comparison
equal
deleted
inserted
replaced
1734:fbc625ba4098 | 1735:34f7ca02767c |
---|---|
59 fi | 59 fi |
60 | 60 |
61 [ -z "$(which distccd)" ] && [ -e ../host/distccd ] && | 61 [ -z "$(which distccd)" ] && [ -e ../host/distccd ] && |
62 PATH="$PATH:$(pwd)/../host" | 62 PATH="$PATH:$(pwd)/../host" |
63 | 63 |
64 [ -z "$CPUS" ] && CPUS=1 | |
65 if [ -z "$(which distccd)" ] | 64 if [ -z "$(which distccd)" ] |
66 then | 65 then |
67 echo 'No distccd in $PATH, acceleration disabled.' | 66 echo 'No distccd in $PATH, acceleration disabled.' |
68 elif [ -z "$DISTCC_PATH" ] | 67 elif [ -z "$DISTCC_PATH" ] |
69 then | 68 then |
106 fi | 105 fi |
107 PATH="$(pwd)/distcc_links" "$(which distccd)" --no-detach --daemon \ | 106 PATH="$(pwd)/distcc_links" "$(which distccd)" --no-detach --daemon \ |
108 --listen 127.0.0.1 -a 127.0.0.1 -p $PORT --jobs $CPUS \ | 107 --listen 127.0.0.1 -a 127.0.0.1 -p $PORT --jobs $CPUS \ |
109 --log-stderr --verbose 2>distccd.log & | 108 --log-stderr --verbose 2>distccd.log & |
110 | 109 |
110 DISTCC_PID="$(jobs -p)" | |
111 # Clean up afterwards: Kill child processes we started (I.E. distccd). | 111 # Clean up afterwards: Kill child processes we started (I.E. distccd). |
112 trap "kill $(jobs -p)" EXIT | 112 trap "kill $DISTCC_PID" EXIT |
113 | 113 |
114 # When background processes die, they should do so silently. | 114 # When background processes die, they should do so silently. |
115 disown $(jobs -p) | 115 disown $DISTCC_PID |
116 | 116 |
117 # Let the QEMU launch know we're using distcc. | 117 # Let the QEMU launch know we're using distcc. |
118 | 118 |
119 DISTCC_PATH_PREFIX=/usr/distcc: | 119 echo "distccd pid $DISTCC_PID port $PORT" |
120 KERNEL_EXTRA="DISTCC_HOSTS=10.0.2.2:$PORT/$CPUS $KERNEL_EXTRA" | 120 KERNEL_EXTRA="DISTCC_HOSTS=10.0.2.2:$PORT/$CPUS $KERNEL_EXTRA" |
121 fi | 121 fi |
122 | 122 |
123 [ -z "$CPUS" ] && CPUS=1 | |
123 KERNEL_EXTRA="CPUS=$CPUS $KERNEL_EXTRA" | 124 KERNEL_EXTRA="CPUS=$CPUS $KERNEL_EXTRA" |
124 | 125 |
125 # Kill our child processes on exit. | 126 # Kill our child processes on exit. |
126 | 127 |
127 trap "pkill -P$$" EXIT | 128 trap "pkill -P$$" EXIT |