diff options
Diffstat (limited to 'Tools/scripts/tindex')
| -rwxr-xr-x | Tools/scripts/tindex | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/Tools/scripts/tindex b/Tools/scripts/tindex index b55e079739b6..deb6af315593 100755 --- a/Tools/scripts/tindex +++ b/Tools/scripts/tindex @@ -29,7 +29,6 @@ SCP_DEST_DIR=/usr/local/www/ports # Location of ports tree and source trees export BASEDIR=/local0/tmp/kris/tindex export PORTSDIR=${BASEDIR}/ports -export SRCDIR5=${BASEDIR}/src.5 export SRCDIR6=${BASEDIR}/src.6 export SRCDIR7=${BASEDIR}/src.7 export SRCDIR8=${BASEDIR}/src.8 @@ -138,10 +137,6 @@ export INDEX_JOBS=4 export INDEX_QUIET=1 # First update the source trees to get current OSVERSION -cd ${SRCDIR5}/sys/sys -cvs -Rq update -PdA -r RELENG_5 param.h -OSVERSION5=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR5}/sys/sys/param.h) - cd ${SRCDIR6}/sys/sys cvs -Rq update -PdA -r RELENG_6 param.h OSVERSION6=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR6}/sys/sys/param.h) @@ -156,7 +151,7 @@ OSVERSION8=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR8 cd ${PORTSDIR} -rm -f INDEX-5 INDEX-5.bz2 INDEX-6 INDEX-6.bz2 INDEX-7 INDEX-7.bz2 INDEX-8 INDEX-8.bz2 +rm -f INDEX-6 INDEX-6.bz2 INDEX-7 INDEX-7.bz2 INDEX-8 INDEX-8.bz2 (cvs -Rq update -PdA 2>1 ) > cvs.log if grep -q ^C cvs.log ; then (echo "cvs update failed with conflicts:"; @@ -164,21 +159,6 @@ if grep -q ^C cvs.log ; then exit 1 fi -BRANCH=5.x -export OSVERSION=${OSVERSION5} -echo "Building INDEX for ${BRANCH} with OSVERSION=${OSVERSION}" -cd ${PORTSDIR} -((make index 2> index.err) > index.out) || indexfail ${BRANCH} -if [ -s index.err ]; then - indexfail ${BRANCH} -fi -checkfixed ${BRANCH} - -createtmpdir -bzip2 -kf ${PORTSDIR}/INDEX-5 -scp -q ${SSHKEY} ${PORTSDIR}/INDEX-5 ${PORTSDIR}/INDEX-5.bz2 ${SCP_DEST_HOST}:${TMPDIR} || mail -s "Cannot copy INDEX-5 to temp dir" ${ERROR_ADDRESS} -ssh ${SCP_DEST_HOST} "/bin/mv ${TMPDIR}/INDEX-5 ${SCP_DEST_DIR}; /bin/mv ${TMPDIR}/INDEX-5.bz2 ${SCP_DEST_DIR}; rmdir ${TMPDIR}" || mail -s "Cannot move INDEX-5 to final dir" ${ERROR_ADDRESS} - BRANCH=6.x export OSVERSION=${OSVERSION6} echo "Building INDEX for ${BRANCH} with OSVERSION=${OSVERSION}" |