From owner-svn-src-projects@FreeBSD.ORG Wed Jan 9 08:09:09 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6ADCB19F; Wed, 9 Jan 2013 08:09:09 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4724D90C; Wed, 9 Jan 2013 08:09:09 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r09899TH096180; Wed, 9 Jan 2013 08:09:09 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0989987096179; Wed, 9 Jan 2013 08:09:09 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201301090809.r0989987096179@svn.freebsd.org> From: Mark Linimon Date: Wed, 9 Jan 2013 08:09:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245220 - projects/portbuild/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 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: Wed, 09 Jan 2013 08:09:09 -0000 Author: linimon (doc,ports committer) Date: Wed Jan 9 08:09:08 2013 New Revision: 245220 URL: http://svnweb.freebsd.org/changeset/base/245220 Log: Restore the definition of buildsdir. Removing this broke all the symlinks under errorlogs/ . While here, remove the things that really are cruft now. Modified: projects/portbuild/scripts/build Modified: projects/portbuild/scripts/build ============================================================================== --- projects/portbuild/scripts/build Wed Jan 9 08:07:09 2013 (r245219) +++ projects/portbuild/scripts/build Wed Jan 9 08:09:08 2013 (r245220) @@ -114,15 +114,14 @@ do_create() { zfs create ${newfs} || exit 1 fi + buildsdir=${pbab}/builds builddir=$(realpath ${buildsdir})/${buildid} # populate ports for latest build on buildenv - # XXX MCL builddir now unused - do_portsupdate_inner ${arch} ${branch} ${buildid} ${builddir} $@ + do_portsupdate_inner ${arch} ${branch} ${buildid} $@ # populate src for latest build on buildenv - # XXX MCL builddir now unused - do_srcupdate_inner ${arch} ${branch} ${buildid} ${builddir} $@ + do_srcupdate_inner ${arch} ${branch} ${buildid} $@ # create the link for building packages for latest build ln -sf ${builddir} ${pbab}/builds/latest @@ -207,16 +206,11 @@ do_clone() { tmp=${tmp%/} newbuilddir="${tmp%/*}/${newid}" - # XXX MCL 20130103 - #oldfs=${ZFS_VOLUME}/portbuild/${arch}/${buildid} - #newfs=${ZFS_VOLUME}/portbuild/${arch}/${newid} oldfs=${ZFS_VOLUME}/portbuild/${arch}/${branch}/builds/${buildid} newfs=${ZFS_VOLUME}/portbuild/${arch}/${branch}/builds/${newid} zfs snapshot ${oldfs}@${newid} || exit 1 zfs clone ${oldfs}@${newid} ${newfs} || exit 1 - # XXX MCL 20130103 - # zfs set mountpoint=${newbuilddir} ${newfs} || exit 1 zfs promote ${newfs} || exit 1 if zfs list -H -t filesystem ${oldfs}/ports 2> /dev/null; then @@ -257,8 +251,6 @@ do_portsupdate() { shift fi - # XXX MCL 20130103 - #destroy_fs ${ZFS_VOLUME}/portbuild/${arch} ${buildid} /ports || exit 1 destroy_fs ${ZFS_VOLUME}/portbuild/${arch}/${branch}/builds ${buildid} /ports || exit 1 if [ "${arg}" = "-umount" ]; then @@ -266,18 +258,15 @@ do_portsupdate() { fi echo - do_portsupdate_inner ${arch} ${branch} ${buildid} ${builddir} $@ + do_portsupdate_inner ${arch} ${branch} ${buildid} $@ } do_portsupdate_inner() { arch=$1 branch=$2 buildid=$3 - builddir=$4 shift 4 - # XXX MCL 20130103 - # portsfs=${ZFS_VOLUME}/portbuild/${arch}/${buildid}/ports portsfs=${ZFS_VOLUME}/portbuild/${arch}/${branch}/builds/${buildid}/ports now=$(now) @@ -288,7 +277,6 @@ do_portsupdate_inner() { zfs snapshot ${ZFS_VOLUME}/${SNAP_PORTS_DIRECTORY}/ports@${now} || exit 1 zfs clone ${ZFS_VOLUME}/${SNAP_PORTS_DIRECTORY}/ports@${now} ${portsfs} || exit 1 - #zfs set mountpoint=${builddir}/ports ${portsfs} || exit 1 } do_srcupdate() { @@ -302,8 +290,6 @@ do_srcupdate() { shift fi - # XXX MCL 20130103 - #destroy_fs ${ZFS_VOLUME}/portbuild/${arch} ${buildid} /src || exit 1 destroy_fs ${ZFS_VOLUME}/portbuild/${arch}/${branch}/builds ${buildid} /src || exit 1 if [ "${arg}" = "-umount" ]; then @@ -311,19 +297,16 @@ do_srcupdate() { fi echo - do_srcupdate_inner ${arch} ${branch} ${buildid} ${builddir} $@ + do_srcupdate_inner ${arch} ${branch} ${buildid} $@ } do_srcupdate_inner() { arch=$1 branch=$2 buildid=$3 - builddir=$4 shift 4 strippedbranch=${branch%%[-\.]*} - # XXX MCL 20130103 - #srcfs=${ZFS_VOLUME}/portbuild/${arch}/${buildid}/src srcfs=${ZFS_VOLUME}/portbuild/${arch}/${branch}/builds/${buildid}/src now=$(now) @@ -334,7 +317,6 @@ do_srcupdate_inner() { zfs snapshot ${ZFS_VOLUME}/${SNAP_SRC_DIRECTORY_PREFIX}${strippedbranch}/src@${now} || exit 1 zfs clone ${ZFS_VOLUME}/${SNAP_SRC_DIRECTORY_PREFIX}${strippedbranch}/src@${now} ${srcfs} || exit 1 - #zfs set mountpoint=${builddir}/src ${srcfs} || exit 1 } cleanup_client() { @@ -500,8 +482,6 @@ do_destroy() { # perform sanity check to prevent e.g. "latest" being destroyed # before "previous" for quoted_subdir in $quoted_subdirs; do - # XXX MCL 20130103 - #fullfs=${ZFS_VOLUME}/portbuild/${arch}/${buildid}`echo $quoted_subdir | sed -e "s/'//g"` fullfs=${ZFS_VOLUME}/portbuild/${arch}/${branch}/builds/${buildid}`echo $quoted_subdir | sed -e "s/'//g"` if test_fs "${fullfs}"; then child=$(get_latest_child ${fullfs}) @@ -515,8 +495,6 @@ do_destroy() { # now ok to do the actual destroy. for quoted_subdir in $quoted_subdirs; do - # XXX MCL 20130103 - #destroy_fs ${ZFS_VOLUME}/portbuild/${arch} ${buildid} `echo $quoted_subdir | sed -e "s/'//g"` || exit 1 destroy_fs ${ZFS_VOLUME}/portbuild/${arch}/${branch}/builds ${buildid} `echo $quoted_subdir | sed -e "s/'//g"` || exit 1 done