1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-13 07:34:50 +00:00

Final patch to fix SRCBASE/OSVERSION issue.

This commit is contained in:
Chris Rees 2013-10-19 20:18:53 +00:00
parent eb75b73361
commit 35edb224d4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=330933
2 changed files with 11 additions and 21 deletions

View File

@ -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/

View File

@ -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 \