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