Date: Wed, 12 May 2021 16:06:45 +0000 From: Glen Barber <gjb@freebsd.org> To: Yasuhiro Kimura <yasu@utahime.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: fb6e261c20eb - main - release: follow-up to previous commit to use Git for the ports tree Message-ID: <20210512160645.GJ92026@FreeBSD.org> In-Reply-To: <20210513.010337.560902240722301845.yasu@utahime.org> References: <202105121448.14CEmfJH042754@gitrepo.freebsd.org> <20210513.010337.560902240722301845.yasu@utahime.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
On Thu, May 13, 2021 at 01:03:37AM +0900, Yasuhiro Kimura wrote:
> Hello Glen,
>
> From: Glen Barber <gjb@FreeBSD.org>
> Subject: git: fb6e261c20eb - main - release: follow-up to previous commit to use Git for the ports tree
> Date: Wed, 12 May 2021 14:48:41 GMT
>
> > diff --git a/release/release.sh b/release/release.sh
> > index 84a7813205f9..87e22e669fd1 100755
> > --- a/release/release.sh
> > +++ b/release/release.sh
> > @@ -222,16 +222,8 @@ chroot_setup() {
> > fi
> > fi
> > if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
> > - # if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
> > - # git -C ${CHROOTDIR}/usr/ports pull -q
> > - # XXX: Workaround for the overlap in the Git conversion timeframe.
> > - if [ -d "${CHROOTDIR}/usr/ports/.svn" ]; then
> > - ${SVNCMD} update ${CHROOTDIR}/usr/ports
> > - else
> > - #${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
> > - # XXX: Workaround for the overlap in the Git
> > - # conversion timeframe.
> > - ${SVNCMD} co ${PORT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports
> > + if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
> > + git -C ${CHROOTDIR}/usr/ports pull -q
> > fi
> > fi
>
> This should be such as following.
>
> ----------------------------------------------------------------------
> if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
> - # if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
> - # git -C ${CHROOTDIR}/usr/ports pull -q
> - # XXX: Workaround for the overlap in the Git conversion timeframe.
> - if [ -d "${CHROOTDIR}/usr/ports/.svn" ]; then
> - ${SVNCMD} update ${CHROOTDIR}/usr/ports
> - else
> - #${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
> - # XXX: Workaround for the overlap in the Git
> - # conversion timeframe.
> - ${SVNCMD} co ${PORT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports
> + if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then
> + git -C ${CHROOTDIR}/usr/ports pull -q
> + else
> + ${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports
> fi
> fi
> ----------------------------------------------------------------------
>
> Or ports tree isn't checked out when build is from scratch.
>
Bah, you're right. I fixed it in stable/13 without noticing it was
needed here, too.
Thanks for spotting this.
Glen
[-- Attachment #2 --]
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmCb/RQACgkQAxRYpUeP
4pN75Q/+Jebv7Kefjt7Q9E+aFj0SHLl8Dt+p2xetVJAyPejm+UEZvrZ4D7kP1A57
fJXgPehfZ6TEYhW0sZIUyMInX+RCmhgcgN6Lhhf/LU9GuHIsLpDjdluv5tOiY4Wr
iitAYvmmycvxZBReyQmEHw1tw5IuHvuys6/RxO2rfUXYLz90CgERykqJ6fUCHM54
5D+RHw/Mio3Daa8F+srCxUkXhKmeFWOsBiKxWdNffVGeYxQispuVQjLmtOoveZRN
pS6e8hdg7ZSFzaDLfW8/Vx2D7Ek3k5i/xPi/aHB0yBLGH+y5JVRGS3fi52dr1zOl
qBRCOdHvwv7Qa9aRM29bBtG/aEzhRF+sskUf2NbT6w7KBGfxopYETNRt90T6Z4qn
73wz8yimmFwkBwfN8IQYOLKNwSuTZEjJN55LnmxLotX5ClyCv2dTWGTqYtqlD+MH
6xgCOXLLHMOHxHW3400vF5zZW1xGGEqL1R5GQeM8w11uj7zQae0I8D3z837erlCT
2VciT6QxDAmgIpbGf8iNSFGalecimYo+3S+io38NtkF+2HCPjs2Wp382vYYvKL9O
P4AAAHkSTDfsDPg+J65nARQCvdKYENTMup5PVoEypVXm78Rv+37COZr8GfWNizef
ygTgo5Ktl4iYN68XhDQDINSdh0g/tUuBBLdjkDqKOaUfm+gxU3A=
=lSKz
-----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210512160645.GJ92026>