aboutsummaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2021-01-18 10:24:13 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2021-01-18 10:24:13 +0000
commita93919ef03c5652ffe96506319ad2af7ffa032e4 (patch)
treef8e1900ffbdb8747118010a5f8de45552eac876a /Tools
parentd8fef55afbf0d663174148d88bf284b47dea399a (diff)
downloadports-a93919ef03c5652ffe96506319ad2af7ffa032e4.tar.gz
ports-a93919ef03c5652ffe96506319ad2af7ffa032e4.zip
tindex: reduce diff with what is used on portsindexbuild
Use git to update src.13
Notes
Notes: svn path=/head/; revision=561907
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/scripts/tindex7
1 files changed, 4 insertions, 3 deletions
diff --git a/Tools/scripts/tindex b/Tools/scripts/tindex
index c9679bbdd2fe..5aaf71cce95a 100755
--- a/Tools/scripts/tindex
+++ b/Tools/scripts/tindex
@@ -15,6 +15,7 @@
# --------------------------------------------------------
# Change these!
+GIT=/usr/local/bin/git
SVN=/usr/local/bin/svn
# Address for success/failure reports
@@ -34,6 +35,7 @@ export OUTDIR=${BASEDIR}/out
# Target architecture if not set in the environment
if [ "${ARCH}" = "" ]; then
export ARCH=i386
+ export MACHINE_ARCH=i386
fi
# --------------------------------------------------------
@@ -120,9 +122,8 @@ OSVERSION11=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR
${SVN} -q up ${SRCDIR12}/sys/sys
OSVERSION12=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
-${SVN} -q up ${SRCDIR13}/sys/sys
-OSVERSION13=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
-
+${GIT} -C ${SRCDIR13} pull --rebase -q
+OSVERSION13=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR13}/sys/sys/param.h)
cd ${PORTSDIR}
rm -f INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2