Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Oct 2013 20:18:53 +0000 (UTC)
From:      Chris Rees <crees@FreeBSD.org>
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
Message-ID:  <201310192018.r9JKIrp8070186@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310192018.r9JKIrp8070186>