Index: user/gjb/thermite-git/13-aarch64-PINE64-LTS-snap.conf =================================================================== --- user/gjb/thermite-git/13-aarch64-PINE64-LTS-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-aarch64-PINE64-LTS-snap.conf (revision 365752) @@ -1,26 +1,25 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="aarch64" export BOARDNAME="PINE64-LTS" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm64/${BOARDNAME}.conf load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-aarch64-PINE64-snap.conf =================================================================== --- user/gjb/thermite-git/13-aarch64-PINE64-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-aarch64-PINE64-snap.conf (revision 365752) @@ -1,26 +1,25 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="aarch64" export BOARDNAME="PINE64" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm64/${BOARDNAME}.conf load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-aarch64-PINEBOOK-snap.conf =================================================================== --- user/gjb/thermite-git/13-aarch64-PINEBOOK-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-aarch64-PINEBOOK-snap.conf (revision 365752) @@ -1,26 +1,25 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="aarch64" export BOARDNAME="PINEBOOK" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm64/${BOARDNAME}.conf load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-aarch64-ROCK64-snap.conf =================================================================== --- user/gjb/thermite-git/13-aarch64-ROCK64-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-aarch64-ROCK64-snap.conf (revision 365752) @@ -1,26 +1,25 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="aarch64" export BOARDNAME="ROCK64" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm64/${BOARDNAME}.conf load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-aarch64-ROCKPRO64-snap.conf =================================================================== --- user/gjb/thermite-git/13-aarch64-ROCKPRO64-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-aarch64-ROCKPRO64-snap.conf (revision 365752) @@ -1,26 +1,25 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="aarch64" export BOARDNAME="ROCKPRO64" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm64/${BOARDNAME}.conf load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-aarch64-RPI3-snap.conf =================================================================== --- user/gjb/thermite-git/13-aarch64-RPI3-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-aarch64-RPI3-snap.conf (revision 365752) @@ -1,26 +1,25 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="aarch64" export BOARDNAME="RPI3" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm64/${BOARDNAME}.conf load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv6-RPI-B-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv6-RPI-B-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv6-RPI-B-snap.conf (revision 365752) @@ -1,30 +1,29 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv6" export KERNEL="RPI-B" export BOARDNAME="RPI-B" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv7-BANANAPI-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv7-BANANAPI-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv7-BANANAPI-snap.conf (revision 365752) @@ -1,29 +1,28 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="BANANAPI" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv7-BEAGLEBONE-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv7-BEAGLEBONE-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv7-BEAGLEBONE-snap.conf (revision 365752) @@ -1,29 +1,28 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="BEAGLEBONE" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv7-CUBIEBOARD-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv7-CUBIEBOARD-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv7-CUBIEBOARD-snap.conf (revision 365752) @@ -1,29 +1,28 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="CUBIEBOARD" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv7-CUBIEBOARD2-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv7-CUBIEBOARD2-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv7-CUBIEBOARD2-snap.conf (revision 365752) @@ -1,29 +1,28 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="CUBIEBOARD2" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv7-CUBOX-HUMMINGBOARD-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv7-CUBOX-HUMMINGBOARD-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv7-CUBOX-HUMMINGBOARD-snap.conf (revision 365752) @@ -1,29 +1,28 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="CUBOX-HUMMINGBOARD" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv7-GENERICSD-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv7-GENERICSD-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv7-GENERICSD-snap.conf (revision 365752) @@ -1,29 +1,28 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="GENERICSD" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv7-PANDABOARD-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv7-PANDABOARD-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv7-PANDABOARD-snap.conf (revision 365752) @@ -1,29 +1,28 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="PANDABOARD" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv7-RPI2-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv7-RPI2-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv7-RPI2-snap.conf (revision 365752) @@ -1,29 +1,28 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="RPI2" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/13-armv7-WANDBOARD-snap.conf =================================================================== --- user/gjb/thermite-git/13-armv7-WANDBOARD-snap.conf (revision 365751) +++ user/gjb/thermite-git/13-armv7-WANDBOARD-snap.conf (revision 365752) @@ -1,29 +1,28 @@ #!/bin/sh # # $FreeBSD$ # BUILDBRANCH="13" . "${__BUILDCONFDIR}/defaults-${BUILDBRANCH}.conf" export EMBEDDED_TARGET_ARCH="armv7" export BOARDNAME="WANDBOARD" -export RELENGDIR="$(realpath $(dirname $(basename ${0}))/../release)" export __CONFIG_NAME="${BUILDBRANCH}-${EMBEDDED_TARGET_ARCH}-${BOARDNAME}-${BUILDTYPE}" export CHROOTDIR="${__WRKDIR_PREFIX}/${__CONFIG_NAME}" . ${srcdir}/release/arm/${BOARDNAME}.conf #KERNEL_FLAGS="-j6" WORLD_FLAGS="-j10" load_stage_env() { TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} } if [ ! -z ${FTP_STAGING} ]; then load_stage_env fi Index: user/gjb/thermite-git/main.conf =================================================================== --- user/gjb/thermite-git/main.conf (revision 365751) +++ user/gjb/thermite-git/main.conf (revision 365752) @@ -1,65 +1,70 @@ #!/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 ${PWD}/thermite.sh))" mkdir -p ${scriptdir}/../release +mkdir -p ${scriptdir}/../ports +mkdir -p ${scriptdir}/../doc mkdir -p ${scriptdir}/../logs mkdir -p ${scriptdir}/../chroots srcdir="$(realpath ${scriptdir}/../release)" +portsdir="$(realpath ${scriptdir}/../ports)" logdir="$(realpath ${scriptdir}/../logs)" +docdir="$(realpath ${scriptdir}/../doc)" chroots="$(realpath ${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" load_stage_env() { } 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 +export RELENGDIR="${srcdir}/release" # 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