Date: Wed, 11 May 2011 08:42:29 +0000 (UTC) From: Florent Thoumie <flz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r221761 - projects/portbuild/scripts Message-ID: <201105110842.p4B8gUs0081530@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flz Date: Wed May 11 08:42:29 2011 New Revision: 221761 URL: http://svn.freebsd.org/changeset/base/221761 Log: portbuild: add support for per-build tweaks. From now on, people can subscribe to their exp-runs only. Modified: 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/dopackages projects/portbuild/scripts/dosetupnode projects/portbuild/scripts/makeduds projects/portbuild/scripts/makeindex projects/portbuild/scripts/makerestr projects/portbuild/scripts/makeworld projects/portbuild/scripts/mkbindist projects/portbuild/scripts/pdispatch projects/portbuild/scripts/portbuild projects/portbuild/scripts/prunefailure projects/portbuild/scripts/setupnode Modified: projects/portbuild/scripts/build ============================================================================== --- projects/portbuild/scripts/build Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/build Wed May 11 08:42:29 2011 (r221761) @@ -544,6 +544,12 @@ if [ $# -ge 1 ]; then esac fi +if [ -n "${buildid}" ]; then + if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf + fi +fi + # Unprivileged commands case "$cmd" in list) Modified: projects/portbuild/scripts/buildfailure ============================================================================== --- projects/portbuild/scripts/buildfailure Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/buildfailure Wed May 11 08:42:29 2011 (r221761) @@ -32,6 +32,9 @@ builddir=${pbd}/${arch}/${branch}/builds . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbc}/scripts/buildenv buildenv ${pbd} ${arch} ${branch} ${builddir} Modified: projects/portbuild/scripts/buildsuccess ============================================================================== --- projects/portbuild/scripts/buildsuccess Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/buildsuccess Wed May 11 08:42:29 2011 (r221761) @@ -26,6 +26,9 @@ builddir=${pbd}/${arch}/${branch}/builds . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbc}/scripts/buildenv buildenv ${pbd} ${arch} ${branch} ${builddir} Modified: projects/portbuild/scripts/claim-chroot ============================================================================== --- projects/portbuild/scripts/claim-chroot Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/claim-chroot Wed May 11 08:42:29 2011 (r221761) @@ -67,6 +67,9 @@ fi . ${pbd}/${arch}/client.conf . ${pbd}/${arch}/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbd}/${arch}/portbuild.$(hostname) buildroot=${scratchdir} Modified: projects/portbuild/scripts/clean-chroot ============================================================================== --- projects/portbuild/scripts/clean-chroot Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/clean-chroot Wed May 11 08:42:29 2011 (r221761) @@ -47,6 +47,9 @@ pbd=${PORTBUILD_DATA:-/var/portbuild} . ${pbd}/${arch}/client.conf . ${pbd}/${arch}/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbd}/${arch}/portbuild.$(hostname) # directories to clean Modified: projects/portbuild/scripts/dopackages ============================================================================== --- projects/portbuild/scripts/dopackages Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/dopackages Wed May 11 08:42:29 2011 (r221761) @@ -450,6 +450,12 @@ touch ${builddir}/.active ln -sf ${pbd}/${arch}/archive/buildlogs/log.${branch}.${datestamp} \ ${builddir}/build.log +# Update build-specific portbuild.conf. +if [ -f ${pbd}/${arch}/${branch}/portbuild.conf ]; then + ln -sf ${pbd}/${arch}/${branch}/portbuild.conf ${builddir}/portbuild.conf + . ${builddir}/portbuild.conf +fi + if [ "$skipstart" = 0 ]; then # Update build Modified: projects/portbuild/scripts/dosetupnode ============================================================================== --- projects/portbuild/scripts/dosetupnode Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/dosetupnode Wed May 11 08:42:29 2011 (r221761) @@ -31,6 +31,9 @@ else echo "Invalid arch ${arch}" exit 1 fi +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbc}/scripts/buildenv # Check for non-fatal rsync errors @@ -58,6 +61,7 @@ setup() { echo "setting up of $node started at $(date)" . ${pbd}/${arch}/portbuild.conf + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf . ${pbd}/${arch}/portbuild.${node} if [ "${buildid}" != "-" ]; then @@ -102,6 +106,14 @@ setup() { ${client_user}@${node}:${builddir}/ checkerror $? || (echo "Copying scripts to ${node} failed"; return 1) + if [ -f ${builddir}/portbuild.conf ]; then + rsync ${rsync_gzip} -e "${ssh_cmd}" -r -L -p --delete ${builddir}/portbuild.conf \ + ${client_user}@${node}:${builddir}/ + checkerror $? || (echo "Copying custom portbuild.conf to ${node} failed"; return 1) + else + echo "No custom portbuild.conf." + fi + rsync ${rsync_gzip} -e "${ssh_cmd}" -r -L -p \ ${builddir}/ports-${buildid}.tbz \ ${builddir}/ports-${buildid}.tbz.md5 \ Modified: projects/portbuild/scripts/makeduds ============================================================================== --- projects/portbuild/scripts/makeduds Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/makeduds Wed May 11 08:42:29 2011 (r221761) @@ -23,6 +23,9 @@ builddir=${pbd}/${arch}/${branch}/builds . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbc}/scripts/buildenv # -j# to make duds Modified: projects/portbuild/scripts/makeindex ============================================================================== --- projects/portbuild/scripts/makeindex Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/makeindex Wed May 11 08:42:29 2011 (r221761) @@ -35,6 +35,9 @@ builddir=${pbd}/${arch}/${branch}/builds . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbc}/scripts/buildenv # Set up the build env variables Modified: projects/portbuild/scripts/makerestr ============================================================================== --- projects/portbuild/scripts/makerestr Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/makerestr Wed May 11 08:42:29 2011 (r221761) @@ -20,6 +20,9 @@ target=$4 . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbc}/scripts/buildenv builddir=${pbd}/${arch}/${branch}/builds/${buildid} Modified: projects/portbuild/scripts/makeworld ============================================================================== --- projects/portbuild/scripts/makeworld Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/makeworld Wed May 11 08:42:29 2011 (r221761) @@ -22,6 +22,9 @@ builddir=${pbd}/${arch}/${branch}/builds . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi # NB: we can't use buildenv because it sets ARCH and MACHINE_ARCH that # confuses cross-builds Modified: projects/portbuild/scripts/mkbindist ============================================================================== --- projects/portbuild/scripts/mkbindist Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/mkbindist Wed May 11 08:42:29 2011 (r221761) @@ -30,6 +30,9 @@ pbd=${PORTBUILD_DATA:-/var/portbuild} . ${pbc}/conf/server.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbc}/scripts/buildenv Modified: projects/portbuild/scripts/pdispatch ============================================================================== --- projects/portbuild/scripts/pdispatch Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/pdispatch Wed May 11 08:42:29 2011 (r221761) @@ -21,6 +21,9 @@ pbab=${pbd}/${arch}/${branch} . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbc}/scripts/buildenv timeout=${PDISPATCH_TIMEOUT} Modified: projects/portbuild/scripts/portbuild ============================================================================== --- projects/portbuild/scripts/portbuild Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/portbuild Wed May 11 08:42:29 2011 (r221761) @@ -68,6 +68,9 @@ nice=0 . ${pbd}/${arch}/common.conf # note: should NOT need anything from server.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbd}/${arch}/portbuild.$(hostname) . ${pbd}/scripts/buildenv Modified: projects/portbuild/scripts/prunefailure ============================================================================== --- projects/portbuild/scripts/prunefailure Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/prunefailure Wed May 11 08:42:29 2011 (r221761) @@ -32,6 +32,9 @@ shift 3 . ${pbc}/conf/server.conf . ${pbc}/conf/common.conf . ${pbd}/${arch}/portbuild.conf +if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf +fi . ${pbc}/scripts/buildenv builddir=${pbd}/${arch}/${branch}/builds/${buildid} Modified: projects/portbuild/scripts/setupnode ============================================================================== --- projects/portbuild/scripts/setupnode Wed May 11 07:39:08 2011 (r221760) +++ projects/portbuild/scripts/setupnode Wed May 11 08:42:29 2011 (r221761) @@ -97,6 +97,9 @@ postcopy() { # By now the portbuild.conf files are in place so we can source them . ${pbd}/${arch}/portbuild.conf + if [ -f ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf ]; then + . ${pbd}/${arch}/${branch}/builds/${buildid}/portbuild.conf + fi me=$(hostname) if [ -f ${pbd}/${arch}/portbuild.${me} ] ; then . ${pbd}/${arch}/portbuild.${me}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105110842.p4B8gUs0081530>