From owner-svn-src-user@freebsd.org Wed Sep 2 17:26:15 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 89E183DD81B for ; Wed, 2 Sep 2020 17:26:15 +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 4BhW7W36Qlz3Y7Z; Wed, 2 Sep 2020 17:26:15 +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 4ED52DD66; Wed, 2 Sep 2020 17:26:15 +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 082HQF3d074296; Wed, 2 Sep 2020 17:26:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082HQFhW074295; Wed, 2 Sep 2020 17:26:15 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202009021726.082HQFhW074295@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 2 Sep 2020 17:26:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365259 - 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: 365259 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: Wed, 02 Sep 2020 17:26:15 -0000 Author: gjb Date: Wed Sep 2 17:26:14 2020 New Revision: 365259 URL: https://svnweb.freebsd.org/changeset/base/365259 Log: Re-sync with releng repo: - Add additional zfs datasets to destroy. - Call zfs_teardown() twice, as some datasets are created in non-intuitive ways. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: user/gjb/thermite-git/zfs-cleanup.sh Modified: user/gjb/thermite-git/zfs-cleanup.sh ============================================================================== --- user/gjb/thermite-git/zfs-cleanup.sh Wed Sep 2 16:29:40 2020 (r365258) +++ user/gjb/thermite-git/zfs-cleanup.sh Wed Sep 2 17:26:14 2020 (r365259) @@ -93,11 +93,26 @@ zfs_teardown() { done done - zfs destroy ${zfs_parent}/${r}-amd64-worldseed-snap@clone - zfs destroy ${zfs_parent}/${r}-amd64-worldseed-snap - zfs destroy ${zfs_parent}/${r}-i386-worldseed-snap@clone - zfs destroy ${zfs_parent}/${r}-i386-worldseed-snap + # XXX + zfs destroy ${zfs_parent}/releng/scripts-${t}shot/chroots + zfs destroy ${zfs_parent}/releng/scripts-${t}shot + zfs destroy ${zfs_parent}/releng + zfs destroy ${zfs_parent}/${r}-ports-${t}@clone + zfs destroy ${zfs_parent}/${r}-src-${t}@clone + zfs destroy ${zfs_parent}/releng/scripts-${t}shot/chroots/${r}/amd64/snap + zfs destroy ${zfs_parent}/releng/scripts-${t}shot/chroots/${r}/amd64 + zfs destroy ${zfs_parent}/releng/scripts-${t}shot/chroots/${r} + zfs destroy ${zfs_parent}/${r}-chroots-${t} + zfs destroy ${zfs_parent}/${r}-logs-${t} + zfs destroy ${zfs_parent}/${r}-ports-${t} + zfs destroy ${zfs_parent}/${r}-src-${t} + # XXX + zfs destroy ${zfs_parent}/${r}-amd64-worldseed-${t}@clone + zfs destroy ${zfs_parent}/${r}-amd64-worldseed-${t} + zfs destroy ${zfs_parent}/${r}-i386-worldseed-${t}@clone + zfs destroy ${zfs_parent}/${r}-i386-worldseed-${t} + echo -n "ZFS datasets were destroyed. They will be created" echo " automatically via thermite.sh." @@ -144,6 +159,7 @@ main() { pfx="===" delete_only=1 + zfs_teardown zfs_teardown } From owner-svn-src-user@freebsd.org Wed Sep 2 17:28: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 995E93DD8CD for ; Wed, 2 Sep 2020 17:28: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 4BhW9w3Yhbz3YR7; Wed, 2 Sep 2020 17:28: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 5D9D8DEC3; Wed, 2 Sep 2020 17:28: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 082HSKC2074427; Wed, 2 Sep 2020 17:28:20 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082HSK1s074426; Wed, 2 Sep 2020 17:28:20 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202009021728.082HSK1s074426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 2 Sep 2020 17:28:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365260 - 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: 365260 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: Wed, 02 Sep 2020 17:28:20 -0000 Author: gjb Date: Wed Sep 2 17:28:19 2020 New Revision: 365260 URL: https://svnweb.freebsd.org/changeset/base/365260 Log: Re-sync with releng repo: - Create the {release,logs,chroots} directories and expand the paths using realpath(1). - Default parallel builds to enabled. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: user/gjb/thermite-git/main.conf Modified: user/gjb/thermite-git/main.conf ============================================================================== --- user/gjb/thermite-git/main.conf Wed Sep 2 17:26:14 2020 (r365259) +++ user/gjb/thermite-git/main.conf Wed Sep 2 17:28:19 2020 (r365260) @@ -9,14 +9,17 @@ use_zfs=1 emailgoesto= emailsentfrom= -scriptdir="$(dirname $(realpath ${0}))" -srcdir="${scriptdir}/../release" -logdir="${scriptdir}/../logs" -chroots="${scriptdir}/../chroots" +scriptdir="$(dirname $(realpath ${PWD}/thermite.sh))" +mkdir -p ${scriptdir}/../release +mkdir -p ${scriptdir}/../logs +mkdir -p ${scriptdir}/../chroots +srcdir="$(realpath ${scriptdir}/../release)" +logdir="$(realpath ${scriptdir}/../logs)" +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="" +#parallel="" +parallel="parallel" ftpdir="/snap/ftp" From owner-svn-src-user@freebsd.org Wed Sep 2 17:31:07 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 58EE13DD8E0 for ; Wed, 2 Sep 2020 17:31:07 +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 4BhWF71gghz3YTR; Wed, 2 Sep 2020 17:31:07 +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 1D266E11D; Wed, 2 Sep 2020 17:31:07 +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 082HV6n0078472; Wed, 2 Sep 2020 17:31:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 082HV6UM078471; Wed, 2 Sep 2020 17:31:06 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202009021731.082HV6UM078471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 2 Sep 2020 17:31:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365261 - 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: 365261 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: Wed, 02 Sep 2020 17:31:07 -0000 Author: gjb Date: Wed Sep 2 17:31:06 2020 New Revision: 365261 URL: https://svnweb.freebsd.org/changeset/base/365261 Log: Re-sync thermite.sh with releng repo: Fix two issues that crept in during debugging - Create the zfs snapshot for the clone before cloning the src tree. - In zfs_create_tree(), return 0 if the tree is 'src', since the tree exists as result of checking out to the ../release area. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: user/gjb/thermite-git/thermite.sh Modified: user/gjb/thermite-git/thermite.sh ============================================================================== --- user/gjb/thermite-git/thermite.sh Wed Sep 2 17:28:19 2020 (r365260) +++ user/gjb/thermite-git/thermite.sh Wed Sep 2 17:31:06 2020 (r365261) @@ -176,6 +176,7 @@ zfs_mount_src() { _seedmount=${chroots}/${rev}/${arch}/${type} _seedtarget="${zfs_parent}/${rev}-${arch}-${type}-chroot" info "Creating ${_seedtarget} from ${_clone}" + zfs snapshot ${_clone}@clone zfs clone -p -o atime=off -o mountpoint=${_seedmount} \ ${_clone}@clone ${_seedtarget} unset _clone _mount _target _tree _seedmount _seedtarget @@ -188,7 +189,7 @@ zfs_create_tree() { [ ! -z $(eval echo \${zfs_${_tree}_seed_${rev}_${type}}) ] && return 0 case ${_tree} in src) - _gitsrc="${GITROOT}/${GITSRC}" + return 0 ;; doc) [ ! -z ${NODOC} ] && return 0 From owner-svn-src-user@freebsd.org Thu Sep 3 15:57:37 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 B8D043C2A66 for ; Thu, 3 Sep 2020 15:57:37 +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 4Bj56n4XDgz4ckY; Thu, 3 Sep 2020 15:57:37 +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 7AB801E212; Thu, 3 Sep 2020 15:57:37 +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 083Fvbts013815; Thu, 3 Sep 2020 15:57:37 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 083FvbkT013814; Thu, 3 Sep 2020 15:57:37 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009031557.083FvbkT013814@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Thu, 3 Sep 2020 15:57:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r365303 - user/cperciva/freebsd-update-build/scripts X-SVN-Group: user X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: user/cperciva/freebsd-update-build/scripts X-SVN-Commit-Revision: 365303 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: Thu, 03 Sep 2020 15:57:37 -0000 Author: gordon Date: Thu Sep 3 15:57:37 2020 New Revision: 365303 URL: https://svnweb.freebsd.org/changeset/base/365303 Log: Exclude mandoc.db from freebsd-update data Differential Revision: https://reviews.freebsd.org/D26187 Modified: user/cperciva/freebsd-update-build/scripts/build.subr Modified: user/cperciva/freebsd-update-build/scripts/build.subr ============================================================================== --- user/cperciva/freebsd-update-build/scripts/build.subr Thu Sep 3 14:50:15 2020 (r365302) +++ user/cperciva/freebsd-update-build/scripts/build.subr Thu Sep 3 15:57:37 2020 (r365303) @@ -856,7 +856,9 @@ stageworld () { for M in INDEX-ALL INDEX-NEW INDEX-OLD; do # Create publishable version indexpublish < ${WORKDIR}/${M}.new \ - | fgrep -v 'kernel|generic|/boot/kernel/linker.hints' \ + | fgrep -v -e 'kernel|generic|/boot/kernel/linker.hints' \ + -e 'world|base|/usr/share/man/mandoc.db' \ + -e 'world|base|/usr/share/openssl/man/mandoc.db' \ > ${WORKDIR}/${M}.new.pub || true # Copy to staging area