svn commit: r259155 - user/nwhitehorn/condorports

[Nathan Whitehorn]

Author: nwhitehorn
Date: Tue Dec 10 04:57:56 2013
New Revision: 259155
URL: http://svnweb.freebsd.org/changeset/base/259155

Log:
  Set PORTSDIR for non-/usr/ports trees

Modified:
  user/nwhitehorn/condorports/buildport.sh
  user/nwhitehorn/condorports/buildportsdag.sh
  user/nwhitehorn/condorports/stagebuildfiles.sh

Modified: user/nwhitehorn/condorports/buildport.sh
==============================================================================
--- user/nwhitehorn/condorports/buildport.sh	Tue Dec 10 02:05:03 2013	(r259154)
+++ user/nwhitehorn/condorports/buildport.sh	Tue Dec 10 04:57:56 2013	(r259155)
@@ -19,8 +19,8 @@ cat $tarballname | sudo jexec $_CONDOR_S
 # XXX: work around bug in pkg
 sudo jexec $_CONDOR_SLOT /etc/rc.d/ldconfig start
 
-sudo jexec $_CONDOR_SLOT make -C $port install USE_PACKAGE_DEPENDS=true BATCH=true WRKDIRPREFIX=/obj DISABLE_MAKE_JOBS=true PKGREPOSITORY=/packages PACKAGES=/packages DISTDIR=/distfiles
-sudo jexec $_CONDOR_SLOT make -C $port package PKGREPOSITORY=/packages PACKAGES=/packages BATCH=true NO_LATEST_LINK=true WRKDIRPREFIX=/obj
+sudo jexec $_CONDOR_SLOT make -C $port install USE_PACKAGE_DEPENDS=true BATCH=true WRKDIRPREFIX=/obj DISABLE_MAKE_JOBS=true PKGREPOSITORY=/packages PACKAGES=/packages DISTDIR=/distfiles PORTSDIR=$portsdir
+sudo jexec $_CONDOR_SLOT make -C $port package PKGREPOSITORY=/packages PACKAGES=/packages BATCH=true NO_LATEST_LINK=true WRKDIRPREFIX=/obj PORTSDIR=$portsdir
 sudo jexec $_CONDOR_SLOT cat /packages/$pkg > $scratchdir/$pkg
 sudo /pkgscripts/reapbuildjail $_CONDOR_SLOT
 set +e

Modified: user/nwhitehorn/condorports/buildportsdag.sh
==============================================================================
--- user/nwhitehorn/condorports/buildportsdag.sh	Tue Dec 10 02:05:03 2013	(r259154)
+++ user/nwhitehorn/condorports/buildportsdag.sh	Tue Dec 10 04:57:56 2013	(r259155)
@@ -23,7 +23,7 @@ for category in $(make -C $PORTSDIR -V S
 	export UNAME_p=$ARCH
 	PKGNAME=$(make package-name)
 	TARBALL=$STAGEDIR/stage-$category-$port.tar
-	echo SCRIPT PRE $job stagebuildfiles.sh $job $PKGSDIR $ARCH $TARBALL $DISTHORDE >> $dagjobs
+	echo SCRIPT PRE $job stagebuildfiles.sh $job $PKGSDIR $ARCH $TARBALL $DISTHORDE $PORTSDIR >> $dagjobs
 	echo SCRIPT POST $job postbuild.sh $TARBALL \$RETURN >> $dagjobs
 	echo VARS $job BuildArch=\"$ARCH\" >> $dagjobs
 	echo VARS $job port=\"$job\" >> $dagjobs

Modified: user/nwhitehorn/condorports/stagebuildfiles.sh
==============================================================================
--- user/nwhitehorn/condorports/stagebuildfiles.sh	Tue Dec 10 02:05:03 2013	(r259154)
+++ user/nwhitehorn/condorports/stagebuildfiles.sh	Tue Dec 10 04:57:56 2013	(r259155)
@@ -27,7 +27,7 @@ DIST_SUBDIR=$DISTHORDE/$(make -V DIST_SU
 ALLFILES=$(for f in `make -V ALLFILES`; do echo $DIST_SUBDIR/$f; done)
 
 # Find packages
-DEPENDS=`make all-depends-list LOCALBASE=/var/empty`
+DEPENDS=`make all-depends-list LOCALBASE=/var/empty PORTSDIR=$6`
 PKGLIST=$(for x in $DEPENDS; do make -C $x PACKAGES=$2 -V PKGFILE; done)
 
 rm -rf $TARBALL-dir