svn commit: r364889 - user/gjb/thermite-git
Glen Barber
gjb at FreeBSD.org
Thu Aug 27 21:08:24 UTC 2020
Author: gjb
Date: Thu Aug 27 21:08:23 2020
New Revision: 364889
URL: https://svnweb.freebsd.org/changeset/base/364889
Log:
Update primary configuration files for thermite to build from git.
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
user/gjb/thermite-git/builds-13.conf
user/gjb/thermite-git/defaults-13.conf
user/gjb/thermite-git/main.conf
Modified: user/gjb/thermite-git/builds-13.conf
==============================================================================
--- user/gjb/thermite-git/builds-13.conf Thu Aug 27 21:07:31 2020 (r364888)
+++ user/gjb/thermite-git/builds-13.conf Thu Aug 27 21:08:23 2020 (r364889)
@@ -5,24 +5,16 @@
. "${__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
Modified: user/gjb/thermite-git/defaults-13.conf
==============================================================================
--- user/gjb/thermite-git/defaults-13.conf Thu Aug 27 21:07:31 2020 (r364888)
+++ user/gjb/thermite-git/defaults-13.conf Thu Aug 27 21:08:23 2020 (r364889)
@@ -5,13 +5,11 @@
. "${__BUILDCONFDIR}/main.conf"
-BUILDSVNREV="$(cat ${__BUILDCONFDIR}/svnrev_src)"
-BUILDDATE="$(cat ${__BUILDCONFDIR}/builddate)"
BUILDTYPE="snap"
-SRCBRANCH="base/head@${BUILDSVNREV}"
-PORTBRANCH="ports/head at HEAD"
-DOCBRANCH="doc/head at HEAD"
+SRCBRANCH="main"
+PORTBRANCH="main"
+DOCBRANCH="main"
WITH_DVD=
WITH_COMPRESSED_IMAGES=1
@@ -25,3 +23,5 @@ case ${BUILDTYPE} in
NODOC=
;;
esac
+
+KERNEL_FLAGS=""
Modified: user/gjb/thermite-git/main.conf
==============================================================================
--- user/gjb/thermite-git/main.conf Thu Aug 27 21:07:31 2020 (r364888)
+++ user/gjb/thermite-git/main.conf Thu Aug 27 21:08:23 2020 (r364889)
@@ -25,16 +25,12 @@ 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 ))"
@@ -44,8 +40,8 @@ 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
More information about the svn-src-user
mailing list