Index: user/gjb/thermite-git/builds-13.conf
===================================================================
--- user/gjb/thermite-git/builds-13.conf	(revision 364888)
+++ user/gjb/thermite-git/builds-13.conf	(revision 364889)
@@ -1,28 +1,20 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 . "${__BUILDCONFDIR}/main.conf"
 
-releasesrc="head"
-heads="12"
+releasesrc="main"
+heads="13"
 stables=
 
 revs="${heads} ${stables}"
-archs="amd64 i386 powerpc powerpc64 powerpcspe sparc64 arm armv6 armv7 aarch64"
+archs="amd64 i386 powerpc powerpc64 powerpcspe armv6 armv7 aarch64"
 types="snap"
 
 x86_kernels="GENERIC"
-arm_kernels="ALLWINNER_UP BANANAPI BEAGLEBONE CUBIEBOARD CUBIEBOARD2 CUBOX-HUMMINGBOARD GUMSTIX"
-arm_kernels="${arm_kernels} RPI-B RPI2 RPI3 PANDABOARD WANDBOARD PINE64"
+arm_kernels="ALLWINNER_UP BANANAPI BEAGLEBONE CUBIEBOARD CUBIEBOARD2 CUBOX-HUMMINGBOARD"
+arm_kernels="${arm_kernels} RPI-B RPI2 RPI3 WANDBOARD PINE64 PINE64-LTS GENERICSD"
+arm_kernels="${arm_kernels} PINEBOOK ROCK64 ROCKPRO64"
 kernels="${x86_kernels} GENERIC64 ${arm_kernels} MPC85XXSPE"
-
-case ${types} in
-	snap)
-		BUILDSVNREV="$(cat ${__BUILDCONFDIR}/svnrev_src)"
-		BUILDDATE="$(cat ${__BUILDCONFDIR}/builddate)"
-		;;
-	*)
-		;;
-esac
Index: user/gjb/thermite-git/defaults-13.conf
===================================================================
--- user/gjb/thermite-git/defaults-13.conf	(revision 364888)
+++ user/gjb/thermite-git/defaults-13.conf	(revision 364889)
@@ -1,27 +1,27 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 . "${__BUILDCONFDIR}/main.conf"
 
-BUILDSVNREV="$(cat ${__BUILDCONFDIR}/svnrev_src)"
-BUILDDATE="$(cat ${__BUILDCONFDIR}/builddate)"
 BUILDTYPE="snap"
 
-SRCBRANCH="base/head@${BUILDSVNREV}"
-PORTBRANCH="ports/head@HEAD"
-DOCBRANCH="doc/head@HEAD"
+SRCBRANCH="main"
+PORTBRANCH="main"
+DOCBRANCH="main"
 
 WITH_DVD=
 WITH_COMPRESSED_IMAGES=1
 XZ_THREADS=0
 
 case ${BUILDTYPE} in
 	snap)
 		NODOC=1
 		;;
 	*)
 		NODOC=
 		;;
 esac
+
+KERNEL_FLAGS=""
Index: user/gjb/thermite-git/main.conf
===================================================================
--- user/gjb/thermite-git/main.conf	(revision 364888)
+++ user/gjb/thermite-git/main.conf	(revision 364889)
@@ -1,66 +1,62 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # Lowercase variables are used by the build script.
 # Uppercase variables are used by the individual build itself.
 
 use_zfs=1
 emailgoesto=
 emailsentfrom=
 scriptdir="$(dirname $(realpath ${0}))"
 srcdir="${scriptdir}/../release"
 logdir="${scriptdir}/../logs"
 chroots="${scriptdir}/../chroots"
 ## To build all architectures in parallel, set the 'parallel' variable to
 ## 'parallel'.  Note, this puts extreme CPU load on the machine.
 #parallel="parallel"
 parallel=""
 
 ftpdir="/snap/ftp"
 
 zfs_root="zroot"
 zfs_mount="releng"
 zfs_parent="${zfs_root}/${zfs_mount}"
 __WRKDIR_PREFIX="/releng"
 
-if [ ! -e "${__BUILDCONFDIR}/svnrev_src" -o \
-	! -e "${__BUILDCONFDIR}/builddate" ]; then
-	echo "svnrev or builddate file does not exist."
-	echo "Run 'setrev.sh -b <branch>' first."
-	exit 1
-fi
-
 load_stage_env() { }
 
-SVNROOT="svn://svn.FreeBSD.org/"
+GITROOT="https://cgit-beta.FreeBSD.org/"
+GITSRC="src.git"
+GITDOC="doc.git"
+GITPORTS="ports.git"
 
 KERNEL="GENERIC"
 WORLD_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
 KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
 
 CHROOTBUILD_SKIP=1
 SRC_UPDATE_SKIP=1
 PORTS_UPDATE_SKIP=1
 DOC_UPDATE_SKIP=1
-# Hack to unset the exported BOARDNAME from sourced arm/armv6 configuration
-# files.
+# Hack to unset the exported BOARDNAME from sourced arm/armv{6,7}
+# configuration files.
 unset BOARDNAME
 unset CHROOT_MAKEENV
 unset EMBEDDEDBUILD
 unset EMBEDDEDPORTS
 unset EMBEDDED_TARGET
 unset EMBEDDED_TARGET_ARCH
 unset WITH_VMIMAGES
 
 # Check if it is a 'releng' hostname.  Do not set this special
 # variable if it is not.
 case "$(hostname -s)" in
 	releng*)
 		export EVERYTHINGISFINE=1
 		;;
 	*)
 		export EVERYTHINGISFINE=
 		;;
 esac