svn commit: r259369 - user/nwhitehorn/condorports

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Dec 14 00:36:29 2013
New Revision: 259369
URL: http://svnweb.freebsd.org/changeset/base/259369

Log:
  Work without a /usr/ports on the submit node

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

Modified: user/nwhitehorn/condorports/buildport.sh
==============================================================================
--- user/nwhitehorn/condorports/buildport.sh	Sat Dec 14 00:25:57 2013	(r259368)
+++ user/nwhitehorn/condorports/buildport.sh	Sat Dec 14 00:36:29 2013	(r259369)
@@ -12,6 +12,8 @@ portsdir=$5
 
 scratchdir=$(pwd)
 
+echo Building $pkg \(origin $port\) for $release on `hostname`
+
 set -e
 sudo /pkgscripts/prepbuildjail $_CONDOR_SLOT $release $portsdir
 cat $tarballname | sudo jexec $_CONDOR_SLOT tar xvf -
@@ -19,8 +21,12 @@ 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 PORTSDIR=$portsdir
-sudo jexec $_CONDOR_SLOT make -C $port package PKGREPOSITORY=/packages PACKAGES=/packages BATCH=true NO_LATEST_LINK=true WRKDIRPREFIX=/obj PORTSDIR=$portsdir
+echo 'Make depends'
+sudo jexec $_CONDOR_SLOT make -C $port depends USE_PACKAGE_DEPENDS=true BATCH=true WRKDIRPREFIX=/obj DISABLE_MAKE_JOBS=true PKGREPOSITORY=/packages PACKAGES=/packages DISTDIR=/distfiles PORTSDIR=$portsdir PACKAGE_BUILDING=1
+echo 'Make install'
+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 PACKAGE_BUILDING=1
+echo 'Make package'
+sudo jexec $_CONDOR_SLOT make -C $port package PKGREPOSITORY=/packages PACKAGES=/packages BATCH=true NO_LATEST_LINK=true WRKDIRPREFIX=/obj PORTSDIR=$portsdir PACKAGE_BUILDING=1
 sudo jexec $_CONDOR_SLOT cat /packages/$pkg > $scratchdir/$pkg
 sudo /pkgscripts/reapbuildjail $_CONDOR_SLOT
 set +e

Modified: user/nwhitehorn/condorports/stagebuildfiles.sh
==============================================================================
--- user/nwhitehorn/condorports/stagebuildfiles.sh	Sat Dec 14 00:25:57 2013	(r259368)
+++ user/nwhitehorn/condorports/stagebuildfiles.sh	Sat Dec 14 00:36:29 2013	(r259369)
@@ -9,6 +9,8 @@ export __MAKE_CONF=/dev/null
 DISTHORDE=$5
 
 export PORT_DBDIR=/var/empty
+export PORTSDIR=$6
+export PACKAGE_BUILDING=1
 
 # Fetch distfiles if unfetched
 cd $1
@@ -16,6 +18,7 @@ make -DBATCH checksum DISTDIR=$DISTHORDE
 make -DBATCH package-links PACKAGES=$2
 mkdir -p $2/All
 
+export LOCALBASE=/var/empty # Delay this since make checksum and package-links depend on pkg
 
 # Make a tarball containing all the bits we need to build: the distfiles, 
 # relevant sections of the ports tree, all dependent packages
@@ -29,7 +32,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 PORTSDIR=$6`
+DEPENDS=`make all-depends-list`
 PKGLIST=$(for x in $DEPENDS; do make -C $x PACKAGES=$2 -V PKGFILE; done)
 
 rm -rf $TARBALL-dir