diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2003-01-24 04:49:09 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2003-01-24 04:49:09 +0000 |
commit | b26c9f68bd47bab44c0ca301add2cb6ba604165f (patch) | |
tree | 8f201ed90c0151b4b1b2f329ac4d388a72937380 /Tools/portbuild | |
parent | - Use ${arch} (diff) |
- Use ${arch}
- Increase timeout to 8 hours (this needs to be made per-arch so it
doesn't overly pessimize fast client machines)
- Support building as a non-privileged user
Notes
Notes:
svn path=/head/; revision=73913
Diffstat (limited to 'Tools/portbuild')
-rwxr-xr-x | Tools/portbuild/scripts/pdispatch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Tools/portbuild/scripts/pdispatch b/Tools/portbuild/scripts/pdispatch index f103103fb111..212844094314 100755 --- a/Tools/portbuild/scripts/pdispatch +++ b/Tools/portbuild/scripts/pdispatch @@ -1,37 +1,37 @@ #!/bin/sh # -# pdispatch <branch> <command> <package.tgz> [<args> ...] +# pdispatch <arch> <branch> <command> <package.tgz> [<args> ...] # # Choose a random machine from ${buildroot}/ulist and dispatch the # job to it via the ptimeout script. pb=/var/portbuild -. ${pb}/portbuild.conf - +arch=$1 +shift +. ${pb}/${arch}/portbuild.conf . ${pb}/scripts/buildenv -# wait 4 hours maximum -timeout=14400 +# wait 8 hours maximum +timeout=28800 branch=$1 command=$2 shift 2 -buildenv ${pb} ${branch} +buildenv ${pb} ${arch} ${branch} # ssh -x doesn't work on some machines unset DISPLAY pkgname=$(basename $1 ${PKGSUFFIX}) -buildroot=$(dirname $(dirname $0)) -if grep -qxF $pkgname ${buildroot}/${branch}/duds; then +if grep -qxF $pkgname ${pb}/${arch}/${branch}/duds; then echo "skipping $pkgname" exit 1 fi args=${1+"$@"} -mach=$(cat ${buildroot}/ulist) +mach=$(cat ${pb}/${arch}/ulist) num=$(echo $(echo $mach | wc -w)) set $mach shift $(echo "$$ $num" | awk '{srand($1); print(int(rand()*$2))}') @@ -49,5 +49,5 @@ if [ "x$NODUMMY" != "x" ]; then flags="${flags} -nodummy" fi -echo "dispatching: ssh -a -t -n $1 ${command} ${branch} $flags $args at $(date)" -${buildroot}/scripts/ptimeout $timeout ssh -a -t -n $1 ${command} ${branch} ${flags} $args +echo "dispatching: ssh -a -t -n root@$1 ${command} ${arch} ${branch} $flags $args at $(date)" +${pb}/scripts/ptimeout.host $timeout ssh -a -t -n root@$1 ${command} ${arch} ${branch} ${flags} $args |