From owner-svn-src-user@FreeBSD.ORG  Fri Jul 26 19:02:17 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 ESMTP id B93AAEF4;
 Fri, 26 Jul 2013 19:02:17 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
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 A74422BDA;
 Fri, 26 Jul 2013 19:02:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6QJ2HX7066190;
 Fri, 26 Jul 2013 19:02:17 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6QJ2Hm4066189;
 Fri, 26 Jul 2013 19:02:17 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201307261902.r6QJ2Hm4066189@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Fri, 26 Jul 2013 19:02:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r253684 - 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.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jul 2013 19:02:17 -0000

Author: nwhitehorn
Date: Fri Jul 26 19:02:17 2013
New Revision: 253684
URL: http://svnweb.freebsd.org/changeset/base/253684

Log:
  Don't rely on the jail setup script to put the jails in any particular place.

Modified:
  user/nwhitehorn/condorports/buildport.sh

Modified: user/nwhitehorn/condorports/buildport.sh
==============================================================================
--- user/nwhitehorn/condorports/buildport.sh	Fri Jul 26 18:27:13 2013	(r253683)
+++ user/nwhitehorn/condorports/buildport.sh	Fri Jul 26 19:02:17 2013	(r253684)
@@ -17,7 +17,7 @@ sudo /pkgscripts/prepbuildjail $_CONDOR_
 cat $tarballname | sudo jexec $_CONDOR_SLOT tar xvf -
 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 BATCH=true NO_LATEST_LINK=true WRKDIRPREFIX=/obj
-cp /scratch/$_CONDOR_SLOT/packages/$pkg $scratchdir/$pkg
+sudo jexec $_CONDOR_SLOT cat /packages/$pkg > $scratchdir/$pkg
 sudo /pkgscripts/reapbuildjail $_CONDOR_SLOT
 set +e