Date: Tue, 15 Sep 2020 15:35:16 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365752 - user/gjb/thermite-git Message-ID: <202009151535.08FFZGxg018063@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Sep 15 15:35:15 2020 New Revision: 365752 URL: https://svnweb.freebsd.org/changeset/base/365752 Log: Re-sync with the releng repository: thermite.sh: Following r365725, move where RELENGDIR is set. This fixes the recently-failing embedded board builds. main.conf: Set portsdir and docdir, as they are used to create ZFS datasets. Export RELENGDIR here, instead from embedded board configs. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: user/gjb/thermite-git/13-aarch64-PINE64-LTS-snap.conf user/gjb/thermite-git/13-aarch64-PINE64-snap.conf user/gjb/thermite-git/13-aarch64-PINEBOOK-snap.conf user/gjb/thermite-git/13-aarch64-ROCK64-snap.conf user/gjb/thermite-git/13-aarch64-ROCKPRO64-snap.conf user/gjb/thermite-git/13-aarch64-RPI3-snap.conf user/gjb/thermite-git/13-armv6-RPI-B-snap.conf user/gjb/thermite-git/13-armv7-BANANAPI-snap.conf user/gjb/thermite-git/13-armv7-BEAGLEBONE-snap.conf user/gjb/thermite-git/13-armv7-CUBIEBOARD-snap.conf user/gjb/thermite-git/13-armv7-CUBIEBOARD2-snap.conf user/gjb/thermite-git/13-armv7-CUBOX-HUMMINGBOARD-snap.conf user/gjb/thermite-git/13-armv7-GENERICSD-snap.conf user/gjb/thermite-git/13-armv7-PANDABOARD-snap.conf user/gjb/thermite-git/13-armv7-RPI2-snap.conf user/gjb/thermite-git/13-armv7-WANDBOARD-snap.conf user/gjb/thermite-git/main.conf Modified: user/gjb/thermite-git/13-aarch64-PINE64-LTS-snap.conf ============================================================================== --- user/gjb/thermite-git/13-aarch64-PINE64-LTS-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-aarch64-PINE64-LTS-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-aarch64-PINE64-snap.conf ============================================================================== --- user/gjb/thermite-git/13-aarch64-PINE64-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-aarch64-PINE64-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-aarch64-PINEBOOK-snap.conf ============================================================================== --- user/gjb/thermite-git/13-aarch64-PINEBOOK-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-aarch64-PINEBOOK-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-aarch64-ROCK64-snap.conf ============================================================================== --- user/gjb/thermite-git/13-aarch64-ROCK64-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-aarch64-ROCK64-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-aarch64-ROCKPRO64-snap.conf ============================================================================== --- user/gjb/thermite-git/13-aarch64-ROCKPRO64-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-aarch64-ROCKPRO64-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-aarch64-RPI3-snap.conf ============================================================================== --- user/gjb/thermite-git/13-aarch64-RPI3-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-aarch64-RPI3-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv6-RPI-B-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv6-RPI-B-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv6-RPI-B-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -10,7 +10,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv7-BANANAPI-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv7-BANANAPI-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv7-BANANAPI-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv7-BEAGLEBONE-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv7-BEAGLEBONE-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv7-BEAGLEBONE-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv7-CUBIEBOARD-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv7-CUBIEBOARD-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv7-CUBIEBOARD-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv7-CUBIEBOARD2-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv7-CUBIEBOARD2-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv7-CUBIEBOARD2-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv7-CUBOX-HUMMINGBOARD-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv7-CUBOX-HUMMINGBOARD-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv7-CUBOX-HUMMINGBOARD-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv7-GENERICSD-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv7-GENERICSD-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv7-GENERICSD-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv7-PANDABOARD-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv7-PANDABOARD-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv7-PANDABOARD-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv7-RPI2-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv7-RPI2-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv7-RPI2-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/13-armv7-WANDBOARD-snap.conf ============================================================================== --- user/gjb/thermite-git/13-armv7-WANDBOARD-snap.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/13-armv7-WANDBOARD-snap.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -9,7 +9,6 @@ BUILDBRANCH="13" 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}" Modified: user/gjb/thermite-git/main.conf ============================================================================== --- user/gjb/thermite-git/main.conf Tue Sep 15 15:21:29 2020 (r365751) +++ user/gjb/thermite-git/main.conf Tue Sep 15 15:35:15 2020 (r365752) @@ -11,10 +11,14 @@ 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. @@ -43,6 +47,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009151535.08FFZGxg018063>