Although I was going to try to avoid it, it turns out that it is
impossble to have merely "server.conf" and "client.conf" control everything on a head node. Some pieces must be refactored into "common.conf".
This commit is contained in:
parent
03f4604fe0
commit
08037129f0
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=265485
9 changed files with 9 additions and 0 deletions
|
@ -29,6 +29,7 @@ shift 4
|
|||
builddir=${pb}/${arch}/${branch}/builds/${buildid}
|
||||
|
||||
. ${pb}/conf/server.conf
|
||||
. ${pb}/conf/common.conf
|
||||
. ${pb}/${arch}/portbuild.conf
|
||||
. ${pb}/scripts/buildenv
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ shift 4
|
|||
builddir=${pb}/${arch}/${branch}/builds/${buildid}
|
||||
|
||||
. ${pb}/conf/server.conf
|
||||
. ${pb}/conf/common.conf
|
||||
. ${pb}/${arch}/portbuild.conf
|
||||
. ${pb}/scripts/buildenv
|
||||
|
||||
|
|
|
@ -65,6 +65,7 @@ if [ ! -f ${builddir}/.ready ]; then
|
|||
fi
|
||||
|
||||
. ${pb}/${arch}/client.conf
|
||||
. ${pb}/${arch}/common.conf
|
||||
. ${pb}/${arch}/portbuild.conf
|
||||
. ${pb}/${arch}/portbuild.$(hostname)
|
||||
|
||||
|
|
|
@ -45,6 +45,7 @@ clean=$5
|
|||
pb=/var/portbuild
|
||||
|
||||
. ${pb}/${arch}/client.conf
|
||||
. ${pb}/${arch}/common.conf
|
||||
. ${pb}/${arch}/portbuild.conf
|
||||
. ${pb}/${arch}/portbuild.$(hostname)
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@ shift 3
|
|||
builddir=${pb}/${arch}/${branch}/builds/${buildid}
|
||||
|
||||
. ${pb}/conf/server.conf
|
||||
. ${pb}/conf/common.conf
|
||||
. ${pb}/${arch}/portbuild.conf
|
||||
. ${pb}/scripts/buildenv
|
||||
|
||||
|
|
|
@ -32,6 +32,7 @@ shift 3
|
|||
builddir=${pb}/${arch}/${branch}/builds/${buildid}
|
||||
|
||||
. ${pb}/conf/server.conf
|
||||
. ${pb}/conf/common.conf
|
||||
. ${pb}/${arch}/portbuild.conf
|
||||
. ${pb}/scripts/buildenv
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@ buildid=$3
|
|||
shift
|
||||
|
||||
. ${pb}/conf/server.conf
|
||||
. ${pb}/conf/common.conf
|
||||
. ${pb}/${arch}/portbuild.conf
|
||||
. ${pb}/scripts/buildenv
|
||||
|
||||
|
|
|
@ -18,6 +18,7 @@ shift 5
|
|||
pbab=${pb}/${arch}/${branch}
|
||||
|
||||
. ${pb}/conf/server.conf
|
||||
. ${pb}/conf/common.conf
|
||||
. ${pb}/${arch}/portbuild.conf
|
||||
. ${pb}/scripts/buildenv
|
||||
|
||||
|
|
|
@ -29,6 +29,7 @@ buildid=$3
|
|||
shift 3
|
||||
|
||||
. ${pb}/conf/server.conf
|
||||
. ${pb}/conf/common.conf
|
||||
. ${pb}/${arch}/portbuild.conf
|
||||
. ${pb}/scripts/buildenv
|
||||
|
||||
|
|
Loading…
Reference in a new issue