From owner-svn-src-user@FreeBSD.ORG Tue Dec 10 04:57:57 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6985ABA6; Tue, 10 Dec 2013 04:57:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4A9101206; Tue, 10 Dec 2013 04:57:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBA4vvRl063276; Tue, 10 Dec 2013 04:57:57 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBA4vuGd063273; Tue, 10 Dec 2013 04:57:56 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201312100457.rBA4vuGd063273@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 10 Dec 2013 04:57:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r259155 - user/nwhitehorn/condorports X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 04:57:57 -0000 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