From owner-freebsd-current@freebsd.org Sat Aug 29 21:30:05 2020 Return-Path: Delivered-To: freebsd-current@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 308B73BD3CD for ; Sat, 29 Aug 2020 21:30:05 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bf8kj0S1xz44V0; Sat, 29 Aug 2020 21:30:05 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id A2835CB92; Sat, 29 Aug 2020 21:30:04 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Sat, 29 Aug 2020 21:30:02 +0000 From: Glen Barber To: Michael Butler Cc: freebsd-current Subject: Re: documentation on release build process change (svn -> git)? Message-ID: <20200829213002.GG19857@FreeBSD.org> References: <20200828174307.GC61041@FreeBSD.org> <20200828174424.GD61041@FreeBSD.org> <20200829151406.GA19857@FreeBSD.org> <95d7aef5-69d4-0215-43ca-0663bc370667@protected-networks.net> <20200829155123.GB19857@FreeBSD.org> <20200829160444.GC19857@FreeBSD.org> <0fbe4d36-6da8-9e63-c830-1dba9fa057ee@protected-networks.net> <20200829211701.GF19857@FreeBSD.org> <36ab2d22-fe14-5be7-a45b-2457fff10773@protected-networks.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="MGu/vTNewDGZ7tmp" Content-Disposition: inline In-Reply-To: <36ab2d22-fe14-5be7-a45b-2457fff10773@protected-networks.net> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1598736605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=WidxM9c1sfg0PWwAnrrI0akc3ZMKhcJPTQA/QsM0TlQ=; b=fM479SU6wt9RDv1BITga0dBs+PREEVhbY7iZFAvW6I6CG1+tWQLNaZ182+NGit6rgAO2Gx l5QwxLnjyM54T3vF73lxhvgCjgFUpBSxl0+cGjgpw9QHrGMWkXzQnZhx10kmqtALWE3oo8 SmI3dvevBDSQ6We3MAm+u9o2Wvll/RByOLdrjdhJtZnBC4hhBFX6B75OEwDoTi18TDZ/3F EgUHAEPy/NlLP6fqXeUVkD3CLvO4Moi9U8mo7dCubX2KGsKllQ/ebhecv6vwHrZ0+71tbs FjOEJgRbmgj7rBv6VlOKghBKbC8ohyqPFsWN1u3xyXirSFzfAfOmIfr34YGwGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1598736605; a=rsa-sha256; cv=none; b=rTF7FMVqhf4oo8QRH/Al7VSfEplxKHLtiCjYUHbnIOiJmnb7nwIYoVB4Erp90ywW0Xr+fJ A/gnXl5wVx1uFwF1PJLv/hHW6Ir2J1B6LnxMqpCf4NdLgpLkwcI/pr3CKQFMHJo2y0eOJs bY2LQM+jA7FnK87uHmg2e7YrD2HoD+mvqAKBv+1D7NLGUB6eYd1sYvO+w6WUB8tPlFv7cH 4a0USndAbdPPolHKi09JNw8chXDf++YwCv8p1AcqXwVqg7QKBL8RZC7u7A1bvVpaevavLq OCOxMCytYwr4KHJz1MEDhbqKYG03uE3CVVTxVl+zBStpOIbnk8135EDx/8gq5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Aug 2020 21:30:05 -0000 --MGu/vTNewDGZ7tmp Content-Type: multipart/mixed; boundary="KIzF6Cje4W/osXrF" Content-Disposition: inline --KIzF6Cje4W/osXrF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Aug 29, 2020 at 05:21:16PM -0400, Michael Butler wrote: > On 8/29/20 5:17 PM, Glen Barber wrote: > > On Sat, Aug 29, 2020 at 04:38:05PM -0400, Michael Butler wrote: > >> The build-from-existing mode fails with .. > >> > >> imb@vm01:/usr/src/release> sudo ./release.sh -c release-i386.conf > >> fatal: not a git repository (or any parent up to mount point /usr) > >> Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not s= et). > >> umount: /usr/local/release-builds/i386/dev: not a file system root dir= ectory > >> > >=20 > > Here's the fun part - Which revision was this? >=20 > The host system is check-out from SVN r364964, >=20 Can you please try the attached patch against your release.sh? Glen --KIzF6Cje4W/osXrF Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="release.sh.txt" Index: release/release.sh =================================================================== --- release/release.sh (revision 364960) +++ release/release.sh (working copy) @@ -223,6 +223,8 @@ chroot_setup() { if [ -z "${SRC_UPDATE_SKIP}" ]; then if [ -d "${CHROOTDIR}/usr/src/.git" ]; then ${VCSUPDATE} -C ${CHROOTDIR}/usr/src + elif [ -d "${CHROOTDIR}/usr/src/.svn" ]; then + svn up ${CHROOTDIR}/usr/src else ${VCSCMD} ${SRC} -b ${SRCBRANCH} ${CHROOTDIR}/usr/src fi @@ -230,6 +232,8 @@ chroot_setup() { if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then if [ -d "${CHROOTDIR}/usr/doc/.git" ]; then ${VCSUPDATE} -C ${CHROOTDIR}/usr/doc + elif [ -d "${CHROOTDIR}/usr/doc/.svn" ]; then + svn up ${CHROOTDIR}/usr/doc else ${VCSCMD} ${DOC} -b ${DOCBRANCH} ${CHROOTDIR}/usr/doc fi @@ -237,6 +241,8 @@ chroot_setup() { if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then ${VCSUPDATE} -C ${CHROOTDIR}/usr/ports + elif [ -d "${CHROOTDIR}/usr/ports/.svn" ]; then + svn up ${CHROOTDIR}/usr/ports else ${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports fi --KIzF6Cje4W/osXrF-- --MGu/vTNewDGZ7tmp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAl9KyNoACgkQAxRYpUeP 4pO4kRAAl7YOnyP9ewjK6pDH7L/yd+VQUvaI7tDKih2zkWBCJlzyHFXbvKU2FTMF XEnld5BvYTlh/M0NVRAGH0YWntOmhs/SU0q6XN0DQ7+EI7CxC+icSkgs4TqhLMJs yedDgCMbasgZdjXV3aTnOO9xcrjDOSHBH2+ZLUMimJTqpKyrLaM2iB5zRwfMyGum m6RrVRjOcyExqsfqViFYwanrAz/lLFFHNHVtZErmB5U/iBHEefq1AUeynMLI9KZp M0FejsWainOpHcX1NP7/xlBELAhoZ0voH6qGqjgmcVjSXDkZuSXAO8t0FffLljGW aJtfZnEG3CEw0oQ+RWuVFVlaLtWp9ug970H6aXmCOo2Kt84H/biFuFjBD/vjzypH f7hiNMY+tLPQiqb79YiDB1usmri3WFrwUjW2R+0J0q73IsN2Bz4N2VFBhDqZ5sTW ia/3dEslf+CDwysKY+FxzLC7ZhmPyH9hz1xq6ntfBZPloQWn2+dgu0+NxE/7Uftp 1+joVLOBw9HtBlnFmPwnCQMf4RHPcUeJd8kcZR/578Kpr7oj4yBE1F6+cnzWHxXP JdGxapR3zsj1X3zlc3qAJWb9cl2P2i7ZKN6ZLTkBv2uxl40z+RsCi7ayhaE1cNPk xeCdOYrJoM4quTcWCQvCMrjwDh3d7tcRalEvAMWBN7Hd+IIr9Cg= =t0Ny -----END PGP SIGNATURE----- --MGu/vTNewDGZ7tmp--