From owner-svn-src-projects@FreeBSD.ORG Thu Apr 28 21:25:59 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32E60106566B; Thu, 28 Apr 2011 21:25:59 +0000 (UTC) (envelope-from flz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 192688FC1B; Thu, 28 Apr 2011 21:25:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3SLPxUM063352; Thu, 28 Apr 2011 21:25:59 GMT (envelope-from flz@svn.freebsd.org) Received: (from flz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3SLPwk9063346; Thu, 28 Apr 2011 21:25:58 GMT (envelope-from flz@svn.freebsd.org) Message-Id: <201104282125.p3SLPwk9063346@svn.freebsd.org> From: Florent Thoumie Date: Thu, 28 Apr 2011 21:25:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221184 - projects/portbuild/scripts X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Apr 2011 21:25:59 -0000 Author: flz Date: Thu Apr 28 21:25:58 2011 New Revision: 221184 URL: http://svn.freebsd.org/changeset/base/221184 Log: portbuild: rsync per-build scripts into /tmp. We don't always have ${builddir}, so use /tmp/${buildid} instead. Modified: projects/portbuild/scripts/claim-chroot projects/portbuild/scripts/dosetupnode projects/portbuild/scripts/pdispatch projects/portbuild/scripts/portbuild projects/portbuild/scripts/setupnode Modified: projects/portbuild/scripts/claim-chroot ============================================================================== --- projects/portbuild/scripts/claim-chroot Thu Apr 28 20:25:15 2011 (r221183) +++ projects/portbuild/scripts/claim-chroot Thu Apr 28 21:25:58 2011 (r221184) @@ -109,7 +109,7 @@ for dir in ${chrootdir}/*; do mkdir ${dir}/used 2>/dev/null || continue touch ${dir}/used/${pkgname} if [ -f ${dir}/.dirty ]; then - ${builddir}/scripts/clean-chroot ${arch} ${branch} ${buildid} ${dir} 2 >/dev/null 2>/dev/null & + /tmp/${buildid}/scripts/clean-chroot ${arch} ${branch} ${buildid} ${dir} 2 >/dev/null 2>/dev/null & continue fi found=1 Modified: projects/portbuild/scripts/dosetupnode ============================================================================== --- projects/portbuild/scripts/dosetupnode Thu Apr 28 20:25:15 2011 (r221183) +++ projects/portbuild/scripts/dosetupnode Thu Apr 28 21:25:58 2011 (r221184) @@ -60,6 +60,12 @@ setup() { . ${pbd}/${arch}/portbuild.conf . ${pbd}/${arch}/portbuild.${node} + if [ "${buildid}" != "-" ]; then + rsync ${rsync_gzip} -e "${ssh_cmd}" -r -l -p --delete ${pbc}/scripts ${pbc}/sources \ + ${client_user}@${node}:/tmp/${buildid}/ + checkerror $? || (echo "Copying scripts to ${node} failed"; return 1) + fi + cmdpath=$(cat ${pbc}/scripts/setupnode | ssh -a ${client_user}@${node} 't=$(mktemp -t setupnode); cat >$t; echo $t; chmod 755 $t') case ${cmdpath} in /tmp/*) ;; *) echo "Failed to scp claim-chroot to ${host}."; return 1;; esac Modified: projects/portbuild/scripts/pdispatch ============================================================================== --- projects/portbuild/scripts/pdispatch Thu Apr 28 20:25:15 2011 (r221183) +++ projects/portbuild/scripts/pdispatch Thu Apr 28 21:25:58 2011 (r221184) @@ -199,7 +199,7 @@ else fi fi -${ssh_cmd} -a -n ${client_user}@${host} ${sudo_cmd} ${builddir}/scripts/clean-chroot ${arch} ${branch} ${buildid} ${chroot} ${clean} +${ssh_cmd} -a -n ${client_user}@${host} ${sudo_cmd} /tmp/${buildid}/scripts/clean-chroot ${arch} ${branch} ${buildid} ${chroot} ${clean} # XXX Set a dirty variable earlier and check here if grep -q "^build of .*ended at" ${builddir}/logs/${pkgname}.log; then Modified: projects/portbuild/scripts/portbuild ============================================================================== --- projects/portbuild/scripts/portbuild Thu Apr 28 20:25:15 2011 (r221183) +++ projects/portbuild/scripts/portbuild Thu Apr 28 21:25:58 2011 (r221184) @@ -298,8 +298,8 @@ while [ $# -gt 0 ]; do shift done -cp -p ${builddir}/scripts/buildscript ${chroot} -cp -p ${builddir}/sources/pnohang.c ${chroot} +cp -p /tmp/${buildid}/scripts/buildscript ${chroot} +cp -p /tmp/${buildid}/sources/pnohang.c ${chroot} # phase 0, compile pnohang chroot ${chroot} /usr/bin/gcc -o /pnohang -Wall /pnohang.c 2>&1 | tee -a ${chroot}/tmp/${pkgname}.log Modified: projects/portbuild/scripts/setupnode ============================================================================== --- projects/portbuild/scripts/setupnode Thu Apr 28 20:25:15 2011 (r221183) +++ projects/portbuild/scripts/setupnode Thu Apr 28 21:25:58 2011 (r221184) @@ -124,7 +124,7 @@ postcopy() { fi for i in ${wrkdir}/chroot/*; do - ${sudo_cmd} ${builddir}/scripts/clean-chroot ${arch} ${branch} ${buildid} ${i} 2 + ${sudo_cmd} /tmp/${buildid}/scripts/clean-chroot ${arch} ${branch} ${buildid} ${i} 2 done wait else