From owner-svn-ports-all@FreeBSD.ORG Sat Oct 19 20:18:54 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1A91ECF0; Sat, 19 Oct 2013 20:18:54 +0000 (UTC) (envelope-from crees@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 DFF272E8B; Sat, 19 Oct 2013 20:18:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9JKIrDS070188; Sat, 19 Oct 2013 20:18:53 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9JKIrp8070186; Sat, 19 Oct 2013 20:18:53 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201310192018.r9JKIrp8070186@svn.freebsd.org> From: Chris Rees Date: Sat, 19 Oct 2013 20:18:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330933 - in head/ports-mgmt/tinderbox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Oct 2013 20:18:54 -0000 Author: crees Date: Sat Oct 19 20:18:53 2013 New Revision: 330933 URL: http://svnweb.freebsd.org/changeset/ports/330933 Log: Final patch to fix SRCBASE/OSVERSION issue. Modified: head/ports-mgmt/tinderbox/Makefile head/ports-mgmt/tinderbox/files/patch-chroot Modified: head/ports-mgmt/tinderbox/Makefile ============================================================================== --- head/ports-mgmt/tinderbox/Makefile Sat Oct 19 20:14:14 2013 (r330932) +++ head/ports-mgmt/tinderbox/Makefile Sat Oct 19 20:18:53 2013 (r330933) @@ -3,7 +3,7 @@ PORTNAME= tinderbox PORTVERSION= 4.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ports-mgmt MASTER_SITES= http://tinderbox.marcuscom.com/ \ http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/ Modified: head/ports-mgmt/tinderbox/files/patch-chroot ============================================================================== --- head/ports-mgmt/tinderbox/files/patch-chroot Sat Oct 19 20:14:14 2013 (r330932) +++ head/ports-mgmt/tinderbox/files/patch-chroot Sat Oct 19 20:18:53 2013 (r330933) @@ -364,26 +364,6 @@ diff -u -r1.176 tc_command.sh addPortToBuild () { -? .fslckout -? .fslckout-mjFA3F63973 -Index: lib/tc_command.sh -=================================================================== -RCS file: /space/cvs/marcuscom-cvs/portstools/tinderbox/lib/tc_command.sh,v -retrieving revision 1.177 -diff -u -r1.177 tc_command.sh ---- lib/tc_command.sh 8 Oct 2013 16:06:48 -0000 1.177 -+++ lib/tc_command.sh 13 Oct 2013 12:54:19 -0000 -@@ -1418,6 +1418,10 @@ - # Finalize environment - cp /etc/resolv.conf ${BUILD_DIR}/etc || touch ${BUILD_DIR}/etc/resolv.conf - -+ # This works around the SRCBASE issue... this needs fixing properly -+ mkdir -p ${BUILD_DIR}/${SRCBASE%/*} -+ ln -s ${BUILD_DIR}/usr/src ${BUILD_DIR}/${SRCBASE} -+ - return 0 - } - Index: lib/tinderlib.sh =================================================================== RCS file: /space/cvs/marcuscom-cvs/portstools/tinderbox/lib/tinderlib.sh,v @@ -403,3 +383,13 @@ diff -u -r1.85 tinderlib.sh # Set ARCH (needed for cross-building) export ARCH=$(${tc} getJailArch -j ${jail}) +--- lib/tc_command.wrong 2013-10-19 21:15:58.461836978 +0100 ++++ lib/tc_command.sh 2013-10-19 21:16:32.105859389 +0100 +@@ -1967,7 +1967,6 @@ + ( + export PORTBUILD_ARGS="$(echo ${pbargs})" + buildenvNoHost ${build} +- buildenv ${jail} ${portstree} ${build} + HOST_WORKDIR=$(${tc} configGet | \ + awk -F= '/^HOST_WORKDIR/ {print $2}') + env PORTSDIR=/a/ports \