Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Dec 2013 15:34:02 GMT
From:      Anes Mukhametov <anes@anes.su>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/184943: ports-mgmt/tinderbox: Fix tc enterBuild
Message-ID:  <201312171534.rBHFY2Jl010061@be.static.corbina.ru>
Resent-Message-ID: <201312171740.rBHHe1R1055359@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         184943
>Category:       ports
>Synopsis:       ports-mgmt/tinderbox: Fix tc enterBuild
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 17 17:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Anes Mukhametov
>Release:        FreeBSD 10.0-ALPHA5 amd64
>Organization:
>Environment:


	
>Description:
	tc enterBuild is broken since 4.1.0
	Fix attached

>How-To-Repeat:
	
>Fix:

	

--- tinderbox-patch begins here ---
Index: ports-mgmt/tinderbox/Makefile
===================================================================
--- ports-mgmt/tinderbox/Makefile	(revision 336616)
+++ ports-mgmt/tinderbox/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tinderbox
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://tinderbox.marcuscom.com/ \
 		http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
Index: ports-mgmt/tinderbox/files/patch-enterbuild
===================================================================
--- ports-mgmt/tinderbox/files/patch-enterbuild	(revision 0)
+++ ports-mgmt/tinderbox/files/patch-enterbuild	(working copy)
@@ -0,0 +1,17 @@
+diff -u lib/tc_command.sh.orig lib/tc_command.sh
+--- lib/tc_command.sh.orig
++++ lib/tc_command.sh
+@@ -1284,11 +1284,12 @@ enterBuild () {
+ 	return 1
+     fi
+ 
++    tc=$(tinderLoc scripts tc)
+     portstree=$(${tc} getPortsTreeForBuild -b ${build})
+     sleepName=$(echo ${portDir} | sed -e 'y/\//_/')
+     buildPortFullDir=${buildRoot}/usr/ports/${portDir}
+     portsTreeDir=$(tinderLoc portstree ${portstree})
+-    portFullDir=${portsTreeDir}/${portDir}
++    portFullDir=${portsTreeDir}/ports/${portDir}
+ 
+     if [ ! -d ${portFullDir} ]; then
+ 	echo "enterBuild: Build environment does not exist yet, sleeping."
--- tinderbox-patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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