From owner-svn-src-user@freebsd.org Sun Sep 13 00:17:05 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2988E3E66E9 for ; Sun, 13 Sep 2020 00:17:05 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bpqmx02bTz4h6l; Sun, 13 Sep 2020 00:17:05 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8EA01D379; Sun, 13 Sep 2020 00:17:04 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D0H4FM063128; Sun, 13 Sep 2020 00:17:04 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D0H4Pn063127; Sun, 13 Sep 2020 00:17:04 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009130017.08D0H4Pn063127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sun, 13 Sep 2020 00:17:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365679 - user/cperciva/freebsd-update-build X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: user/cperciva/freebsd-update-build X-SVN-Commit-Revision: 365679 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Sep 2020 00:17:05 -0000 Author: gordon Date: Sun Sep 13 00:17:04 2020 New Revision: 365679 URL: https://svnweb.freebsd.org/changeset/base/365679 Log: Rework wait logic and add additional output. For some reason, the shell wait doesn't work and immediately returns. Instead, watch the temporary directories that are generated. Add some output to show how progres is going. Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh ============================================================================== --- user/cperciva/freebsd-update-build/build-upgrade-patches.sh Sat Sep 12 23:54:57 2020 (r365678) +++ user/cperciva/freebsd-update-build/build-upgrade-patches.sh Sun Sep 13 00:17:04 2020 (r365679) @@ -5,6 +5,11 @@ if [ $# -lt 3 ]; then exit 1 fi +while [ $(ls -d ${TMPDIR:-/tmp}/genpatch* 2>/dev/null | wc -l) -gt 0 ]; do + echo "There appears to be evidence from previous runs in ${TMPDIR:-/tmp}/genpatch*...bailing" + exit 1 +done + BASEDIR=/usr/freebsd-update-server ARCH=$1 TARGETREL=$2 @@ -22,7 +27,14 @@ genpatch() { gunzip < ${WWWDIR}/${OR}/${ARCH}/f/${OH}.gz > ${tempdir}/${OH} gunzip < ${WWWDIR}/${NR}/${ARCH}/f/${NH}.gz > ${tempdir}/${NH} - bsdiff ${tempdir}/${OH} ${tempdir}/${NH} ${WWWDIR}/to-${TARGETREL}/${ARCH}/bp/${OH}-${NH} + bsdiff ${tempdir}/${OH} ${tempdir}/${NH} ${tempdir}/${OH}-${NH} + if [ $? -eq 0 ]; then + mv ${tempdir}/${OH}-${NH} ${WWWDIR}/to-${TARGETREL}/${ARCH}/bp/${OH}-${NH} + else + echo "Error generating patch ${OH}-${NH}, removing" + rm ${tempdir}/${OH}-${NH} + fi + rm ${tempdir}/${OH} ${tempdir}/${NH} rmdir ${tempdir} } @@ -42,6 +54,7 @@ done | echo "done" echo "Starting patch generation" +marker= zcat ${WWWDIR}/${TARGETREL}/${ARCH}/m/* | cut -f 3,4,9 -d '|' | fgrep '|f|' | @@ -55,6 +68,11 @@ zcat ${WWWDIR}/${TARGETREL}/${ARCH}/m/* | sort -k 2,2 -t '|' | tr '|' ' ' | while read OR OH NR NH; do + if [ "$(echo ${OH} | cut -c1)" != "$marker" ]; then + echo " working on $(echo ${OH} | cut -c1-4)...." + marker="$(echo ${OH} | cut -c1)" + fi + if [ -f ${WWWDIR}/to-${TARGETREL}/${ARCH}/bp/${OH}-${NH} ]; then continue fi @@ -75,6 +93,8 @@ zcat ${WWWDIR}/${TARGETREL}/${ARCH}/m/* | done echo -n "Finished spawning children, waiting for them to finish..." -wait +while [ $(ls -d ${TMPDIR:-/tmp}/genpatch* 2>/dev/null | wc -l) -gt 0 ]; do + sleep 2 +done echo "done" rm hashtab From owner-svn-src-user@freebsd.org Tue Sep 15 15:35:20 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6050B3D6911 for ; Tue, 15 Sep 2020 15:35:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BrS3X1x20z4GCR; Tue, 15 Sep 2020 15:35:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0D2CAA907; Tue, 15 Sep 2020 15:35:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08FFZJFa018081; Tue, 15 Sep 2020 15:35:19 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08FFZGxg018063; Tue, 15 Sep 2020 15:35:16 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202009151535.08FFZGxg018063@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 15 Sep 2020 15:35:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365752 - user/gjb/thermite-git X-SVN-Group: user X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: user/gjb/thermite-git X-SVN-Commit-Revision: 365752 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Sep 2020 15:35:20 -0000 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 From owner-svn-src-user@freebsd.org Fri Sep 18 15:51:17 2020 Return-Path: Delivered-To: svn-src-user@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3305A3E6BEC for ; Fri, 18 Sep 2020 15:51:17 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BtJGY0fJdz3V26; Fri, 18 Sep 2020 15:51:17 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE3F31D676; Fri, 18 Sep 2020 15:51:16 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08IFpGd9092907; Fri, 18 Sep 2020 15:51:16 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08IFpGve092905; Fri, 18 Sep 2020 15:51:16 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009181551.08IFpGve092905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Fri, 18 Sep 2020 15:51:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365885 - in user/cperciva/freebsd-update-build/scripts/12.2-BETA2: . amd64 i386 X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in user/cperciva/freebsd-update-build/scripts/12.2-BETA2: . amd64 i386 X-SVN-Commit-Revision: 365885 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Sep 2020 15:51:17 -0000 Author: gordon Date: Fri Sep 18 15:51:16 2020 New Revision: 365885 URL: https://svnweb.freebsd.org/changeset/base/365885 Log: Add 12.2-BETA2 profile. Added: user/cperciva/freebsd-update-build/scripts/12.2-BETA2/ user/cperciva/freebsd-update-build/scripts/12.2-BETA2/amd64/ user/cperciva/freebsd-update-build/scripts/12.2-BETA2/amd64/build.conf (contents, props changed) user/cperciva/freebsd-update-build/scripts/12.2-BETA2/i386/ user/cperciva/freebsd-update-build/scripts/12.2-BETA2/i386/build.conf (contents, props changed) Added: user/cperciva/freebsd-update-build/scripts/12.2-BETA2/amd64/build.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/scripts/12.2-BETA2/amd64/build.conf Fri Sep 18 15:51:16 2020 (r365885) @@ -0,0 +1,10 @@ +export RELH=c71c9a1ba842ab7024dc4a8cb00dc3e2aeac3985c02547dedb8077b2fe16ae76dacc8ace575c0142ac135bb2fe8a6a6015c84aedbb0dcbc414a6d7e560d86d4c +export FTP=https://people.freebsd.org/~gjb/12.2-BETA2 + +# Components of the world, source, and kernels +export WORLDPARTS="base base-dbg doc lib32 lib32-dbg" +export SOURCEPARTS="src" +export KERNELPARTS="kernel kernel-dbg" + +# EOL date +export EOL=1601769600 Added: user/cperciva/freebsd-update-build/scripts/12.2-BETA2/i386/build.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/cperciva/freebsd-update-build/scripts/12.2-BETA2/i386/build.conf Fri Sep 18 15:51:16 2020 (r365885) @@ -0,0 +1,10 @@ +export RELH=06f9dde7bd7e4a65c01418a7b9a8afff4d884f4ecd22c2b43724efcd429b474ce79a2994d88cdf94f29bbada7da7e5b906e3fefba5d669660e248ac6428765c4 +export FTP=https://people.freebsd.org/~gjb/12.2-BETA2 + +# Components of the world, source, and kernels +export WORLDPARTS="base base-dbg doc" +export SOURCEPARTS="src" +export KERNELPARTS="kernel kernel-dbg" + +# EOL date +export EOL=1601769600