Date: Sat, 29 Aug 2020 21:30:02 +0000 From: Glen Barber <gjb@freebsd.org> To: Michael Butler <imb@protected-networks.net> Cc: freebsd-current <freebsd-current@freebsd.org> Subject: Re: documentation on release build process change (svn -> git)? Message-ID: <20200829213002.GG19857@FreeBSD.org> In-Reply-To: <36ab2d22-fe14-5be7-a45b-2457fff10773@protected-networks.net> References: <20200828174307.GC61041@FreeBSD.org> <20200828174424.GD61041@FreeBSD.org> <aa7989d6-eed5-9575-09bb-536680629e61@protected-networks.net> <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>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200829213002.GG19857>