svn commit: r247146 - projects/portbuild/scripts
Erwin Lansing
erwin at FreeBSD.org
Fri Feb 22 08:43:00 UTC 2013
Author: erwin
Date: Fri Feb 22 08:42:53 2013
New Revision: 247146
URL: http://svnweb.freebsd.org/changeset/base/247146
Log:
Get rid of hardcoded /var/portbuild, which is now /a/portbuild
Modified:
projects/portbuild/scripts/allgohans
projects/portbuild/scripts/build
projects/portbuild/scripts/buildfailure
projects/portbuild/scripts/buildsuccess
projects/portbuild/scripts/claim-chroot
projects/portbuild/scripts/clean-chroot
projects/portbuild/scripts/cleanup-chroots
projects/portbuild/scripts/cleanup-tmp
projects/portbuild/scripts/client-metrics
projects/portbuild/scripts/cpdistfiles
projects/portbuild/scripts/cppackages
projects/portbuild/scripts/do-cleanup-chroots
projects/portbuild/scripts/do-cleanup-tmp
projects/portbuild/scripts/docppackages
projects/portbuild/scripts/dodistfiles
projects/portbuild/scripts/dologs
projects/portbuild/scripts/dopackages
projects/portbuild/scripts/dopackages.wrapper
projects/portbuild/scripts/dosetupnode
projects/portbuild/scripts/flushsquid
projects/portbuild/scripts/keeprestr
projects/portbuild/scripts/makeduds
projects/portbuild/scripts/makeindex
projects/portbuild/scripts/makerestr
projects/portbuild/scripts/pdispatch
projects/portbuild/scripts/portbuild
projects/portbuild/scripts/processfail
projects/portbuild/scripts/processlogs
projects/portbuild/scripts/prunefailure
projects/portbuild/scripts/reportload
projects/portbuild/scripts/setupnode
projects/portbuild/scripts/stats
Modified: projects/portbuild/scripts/allgohans
==============================================================================
--- projects/portbuild/scripts/allgohans Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/allgohans Fri Feb 22 08:42:53 2013 (r247146)
@@ -1,7 +1,7 @@
#!/bin/sh
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbc}/conf/server.conf
Modified: projects/portbuild/scripts/build
==============================================================================
--- projects/portbuild/scripts/build Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/build Fri Feb 22 08:42:53 2013 (r247146)
@@ -4,8 +4,8 @@
# server-side script to handle various commands common to builds
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
# subdirectories to process. yes, this is a hack, but it saves code
# duplication.
Modified: projects/portbuild/scripts/buildfailure
==============================================================================
--- projects/portbuild/scripts/buildfailure Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/buildfailure Fri Feb 22 08:42:53 2013 (r247146)
@@ -9,8 +9,8 @@ cleanup() {
}
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
usage () {
echo "usage: buildfailure arch branch buildid pkgname"
Modified: projects/portbuild/scripts/buildsuccess
==============================================================================
--- projects/portbuild/scripts/buildsuccess Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/buildsuccess Fri Feb 22 08:42:53 2013 (r247146)
@@ -3,8 +3,8 @@
# buildsuccess <arch> <branch> <buildid> <pkgname>
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
usage () {
echo "usage: buildsuccess arch branch buildid pkgname"
Modified: projects/portbuild/scripts/claim-chroot
==============================================================================
--- projects/portbuild/scripts/claim-chroot Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/claim-chroot Fri Feb 22 08:42:53 2013 (r247146)
@@ -18,7 +18,7 @@
# could use a lockf lock, and be able to tell if the setup process was
# still running or died prematurely
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
usage () {
echo "usage: claim-chroot arch branch buildid"
Modified: projects/portbuild/scripts/clean-chroot
==============================================================================
--- projects/portbuild/scripts/clean-chroot Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/clean-chroot Fri Feb 22 08:42:53 2013 (r247146)
@@ -31,7 +31,7 @@ buildid=$3
chroot=$4
clean=$5
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbd}/${arch}/client.conf
. ${pbd}/${arch}/common.conf
Modified: projects/portbuild/scripts/cleanup-chroots
==============================================================================
--- projects/portbuild/scripts/cleanup-chroots Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/cleanup-chroots Fri Feb 22 08:42:53 2013 (r247146)
@@ -7,7 +7,7 @@
# port builds that have timed out or shut down uncleanly) and prunes
# them to reclaim space.
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
# XXX TODO promote
# all times are in minutes
Modified: projects/portbuild/scripts/cleanup-tmp
==============================================================================
--- projects/portbuild/scripts/cleanup-tmp Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/cleanup-tmp Fri Feb 22 08:42:53 2013 (r247146)
@@ -15,7 +15,7 @@ REMOVE_SETUPNODE_TIME=1440
#VERBOSE=1
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
# note: uname is not being overridden (should not need client.conf here)
arch=$(uname -m)
Modified: projects/portbuild/scripts/client-metrics
==============================================================================
--- projects/portbuild/scripts/client-metrics Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/client-metrics Fri Feb 22 08:42:53 2013 (r247146)
@@ -6,7 +6,7 @@
# - max vnodes
# - number of packages built in the past hour
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
arch=$(uname -m)
me=$(hostname)
Modified: projects/portbuild/scripts/cpdistfiles
==============================================================================
--- projects/portbuild/scripts/cpdistfiles Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/cpdistfiles Fri Feb 22 08:42:53 2013 (r247146)
@@ -6,8 +6,8 @@ if [ $# -lt 3 ]; then
fi
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbc}/conf/server.conf
Modified: projects/portbuild/scripts/cppackages
==============================================================================
--- projects/portbuild/scripts/cppackages Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/cppackages Fri Feb 22 08:42:53 2013 (r247146)
@@ -1,7 +1,7 @@
#!/bin/sh
# configurable variables
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbd}/portbuild.conf
Modified: projects/portbuild/scripts/do-cleanup-chroots
==============================================================================
--- projects/portbuild/scripts/do-cleanup-chroots Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/do-cleanup-chroots Fri Feb 22 08:42:53 2013 (r247146)
@@ -3,7 +3,7 @@
# clean up stale chroots on all client machines.
#
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
arch=$0
if [ -z "$arch" ]; then
Modified: projects/portbuild/scripts/do-cleanup-tmp
==============================================================================
--- projects/portbuild/scripts/do-cleanup-tmp Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/do-cleanup-tmp Fri Feb 22 08:42:53 2013 (r247146)
@@ -3,7 +3,7 @@
# clean up stale /tmp on all client machines.
#
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
arch=$0
if [ -z "$arch" ]; then
Modified: projects/portbuild/scripts/docppackages
==============================================================================
--- projects/portbuild/scripts/docppackages Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/docppackages Fri Feb 22 08:42:53 2013 (r247146)
@@ -5,7 +5,7 @@ if [ $# != 1 ]; then
exit 1
fi
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
echo ${pbc}/scripts/cppackages $1 | at + 1 minute
atq
Modified: projects/portbuild/scripts/dodistfiles
==============================================================================
--- projects/portbuild/scripts/dodistfiles Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/dodistfiles Fri Feb 22 08:42:53 2013 (r247146)
@@ -30,7 +30,7 @@ arch=$1
branch=$2
buildid=$3
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
builddir=${pbd}/${arch}/${branch}/builds/${buildid}
Modified: projects/portbuild/scripts/dologs
==============================================================================
--- projects/portbuild/scripts/dologs Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/dologs Fri Feb 22 08:42:53 2013 (r247146)
@@ -4,8 +4,8 @@
arch=$1
versions="latest full"
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbc}/conf/server.conf
. ${pbd}/${arch}/portbuild.conf
Modified: projects/portbuild/scripts/dopackages
==============================================================================
--- projects/portbuild/scripts/dopackages Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/dopackages Fri Feb 22 08:42:53 2013 (r247146)
@@ -4,8 +4,8 @@
# main server-side script to run a package build
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:${pbc}/scripts
Modified: projects/portbuild/scripts/dopackages.wrapper
==============================================================================
--- projects/portbuild/scripts/dopackages.wrapper Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/dopackages.wrapper Fri Feb 22 08:42:53 2013 (r247146)
@@ -6,8 +6,8 @@
# NOTE: rearranged 20100615 to not have to be linked to dopackages.N
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
if [ $# -lt 3 ]; then
echo "usage: $0 <arch> <branch> <buildid> [<args> ...]"
Modified: projects/portbuild/scripts/dosetupnode
==============================================================================
--- projects/portbuild/scripts/dosetupnode Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/dosetupnode Fri Feb 22 08:42:53 2013 (r247146)
@@ -15,8 +15,8 @@
# scripts/ and ${arch}/ directories (e.g. after client reboot)
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
arch=$1
branch=$2
@@ -86,7 +86,7 @@ setup() {
if [ "${norsync}" -eq 0 ]; then
# create one master copy in the default directory
rsync ${rsync_gzip} -e "${ssh_cmd}" -r -l -p --delete ${pbc}/scripts ${pbc}/sources \
- ${client_user}@${node}:/var/portbuild/
+ ${client_user}@${node}:/a/portbuild/
checkerror $? || (echo "Copying scripts to ${node} failed"; return 1)
# copy the default conf files (i.e., client.conf and common.conf) in case
Modified: projects/portbuild/scripts/flushsquid
==============================================================================
--- projects/portbuild/scripts/flushsquid Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/flushsquid Fri Feb 22 08:42:53 2013 (r247146)
@@ -6,7 +6,7 @@
# note: uname is not being overridden
arch=$(uname -m)
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbd}/${arch}/client.conf
. ${pbd}/${arch}/portbuild.conf
Modified: projects/portbuild/scripts/keeprestr
==============================================================================
--- projects/portbuild/scripts/keeprestr Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/keeprestr Fri Feb 22 08:42:53 2013 (r247146)
@@ -16,8 +16,8 @@ arch=$1
branch=$2
buildid=$3
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbc}/conf/server.conf
. ${pbc}/scripts/buildenv
Modified: projects/portbuild/scripts/makeduds
==============================================================================
--- projects/portbuild/scripts/makeduds Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/makeduds Fri Feb 22 08:42:53 2013 (r247146)
@@ -10,8 +10,8 @@ if [ $# -lt 3 ]; then
fi
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
arch=$1
branch=$2
Modified: projects/portbuild/scripts/makeindex
==============================================================================
--- projects/portbuild/scripts/makeindex Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/makeindex Fri Feb 22 08:42:53 2013 (r247146)
@@ -15,8 +15,8 @@ export INDEX_JOBS=1
# For debugging purposes only
#export INDEX_VERBOSE=1
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
usage () {
echo "usage: makeindex arch branch buildid [target]"
Modified: projects/portbuild/scripts/makerestr
==============================================================================
--- projects/portbuild/scripts/makerestr Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/makerestr Fri Feb 22 08:42:53 2013 (r247146)
@@ -9,8 +9,8 @@ if [ $# -lt 3 ]; then
fi
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
arch=$1
branch=$2
Modified: projects/portbuild/scripts/pdispatch
==============================================================================
--- projects/portbuild/scripts/pdispatch Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/pdispatch Fri Feb 22 08:42:53 2013 (r247146)
@@ -6,8 +6,8 @@
#
# server-side script to dispatch the job to a host via the ptimeout script.
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
#VERBOSE=1
Modified: projects/portbuild/scripts/portbuild
==============================================================================
--- projects/portbuild/scripts/portbuild Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/portbuild Fri Feb 22 08:42:53 2013 (r247146)
@@ -8,7 +8,7 @@
# usage: $0 ARCH BRANCH BUILDID CHROOT [-noclean] [-norestr] [-noplistcheck] [-distfiles] [-fetch-original] [-trybroken] PKGNAME.tgz DIRNAME [DEPENDENCY.tgz ...]
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
mount_fs()
{
Modified: projects/portbuild/scripts/processfail
==============================================================================
--- projects/portbuild/scripts/processfail Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/processfail Fri Feb 22 08:42:53 2013 (r247146)
@@ -5,8 +5,8 @@
arch=$1
branch=$2
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbc}/admin/conf/admin.conf
. ${pbc}/conf/server.conf
Modified: projects/portbuild/scripts/processlogs
==============================================================================
--- projects/portbuild/scripts/processlogs Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/processlogs Fri Feb 22 08:42:53 2013 (r247146)
@@ -39,8 +39,8 @@ scriptdir=$(dirname $0)
errorscript=$scriptdir/processonelog
# Figure out which arch we're building for
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbc}/admin/conf/admin.conf
. ${pbc}/conf/server.conf
Modified: projects/portbuild/scripts/prunefailure
==============================================================================
--- projects/portbuild/scripts/prunefailure Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/prunefailure Fri Feb 22 08:42:53 2013 (r247146)
@@ -10,8 +10,8 @@
# these files.
# configurable variables
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
cleanup() {
echo "Problem writing new failure file!"
Modified: projects/portbuild/scripts/reportload
==============================================================================
--- projects/portbuild/scripts/reportload Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/reportload Fri Feb 22 08:42:53 2013 (r247146)
@@ -3,7 +3,7 @@
# client script to report load to the server.
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
# note: uname is not being overridden
arch=$(uname -m)
Modified: projects/portbuild/scripts/setupnode
==============================================================================
--- projects/portbuild/scripts/setupnode Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/setupnode Fri Feb 22 08:42:53 2013 (r247146)
@@ -1,7 +1,7 @@
#!/bin/sh
#
# Script run on the clients, to set them up in preparation for building
-# packages. This includes setting up parts of the /var/portbuild
+# packages. This includes setting up parts of the /a/portbuild
# directory hierarchy, the portbuild script and the bindist.tar file
# for populating the build chroots.
Modified: projects/portbuild/scripts/stats
==============================================================================
--- projects/portbuild/scripts/stats Fri Feb 22 07:07:11 2013 (r247145)
+++ projects/portbuild/scripts/stats Fri Feb 22 08:42:53 2013 (r247146)
@@ -1,7 +1,7 @@
#!/bin/sh
-pbc=${PORTBUILD_CHECKOUT:-/var/portbuild}
-pbd=${PORTBUILD_DATA:-/var/portbuild}
+pbc=${PORTBUILD_CHECKOUT:-/a/portbuild}
+pbd=${PORTBUILD_DATA:-/a/portbuild}
. ${pbc}/admin/conf/admin.conf
. ${pbc}/conf/server.conf
More information about the svn-src-projects
mailing list