From owner-dev-commits-src-all@freebsd.org Wed Jan 20 17:16:49 2021 Return-Path: Delivered-To: dev-commits-src-all@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 4A7384FC73A; Wed, 20 Jan 2021 17:16:49 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DLXJ11hvzz3Khh; Wed, 20 Jan 2021 17:16:49 +0000 (UTC) (envelope-from gjb@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1611163009; 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=xXh9sEyUPKYqDWlujHww2OSSwS2sH3lbaHjFEBm6pLE=; b=FOxDj8GgByZBC5mnemGvlgbILGvIEE6vDUCXOryGJhsq2bgGkF1KI03zoVcoWIDpCEtn9N f12jAEFmWFqgGzT+4sHWdUioub8wjht0QyDc2cYAbsxwrB5/hgljoSGigSVDSDiG1uoG4q eccnc0Q0yBx1wsv/13vadn/nDSor27cooaLgy6Gge9sXNXx+I8yPleucyo15Qv5vZWa6dY 8eVHvxFSu3Cu+MvpvEUz2ajteONyFcWg0xI5zAZzsmeyyip5YdxIsZRrNe6B5XTbEKr2lD 6o/ywPVhpntntFczaCKru+/BwfJQuCRK9K967TlYP3EqgLlvFCaQx9DMqT4ZWw== 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 B6633A6EF; Wed, 20 Jan 2021 17:16:48 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Wed, 20 Jan 2021 17:16:46 +0000 From: Glen Barber To: Yasuhiro Kimura Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 041b28524a3c - main - release: Add workaround to use SVN for ports Message-ID: <20210120171646.GN77557@FreeBSD.org> References: <202101191838.10JIcorS044601@gitrepo.freebsd.org> <20210120.172933.1039050893851306070.yasu@utahime.org> <20210120.194646.2281393142538351130.yasu@utahime.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="ucfHZChuBC0NsER/" Content-Disposition: inline In-Reply-To: <20210120.194646.2281393142538351130.yasu@utahime.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1611163009; 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=xXh9sEyUPKYqDWlujHww2OSSwS2sH3lbaHjFEBm6pLE=; b=oa2yQNGcdVQWOYpUCPevAaYe4WWVyLoKTejPpUKmjWUFxY4zAX2OT+f5+G3Id9xNS7k5qL 5vvML+xUPfX6C37Er1r2beMWaEH5mskK1lgN4JWF0FrzDHM5KJ+C1hyGoR985i75yn5xw6 sC/CLQZ+Jd9jUQyVTBp2VrlCZo9JerR0mK3Rfu/xcvoHIjqNlcQS9WsbQ5fkCCLFywsJUo R3eD62jXuFNAuDwnL4tUQGNWP79eOJvFCcW2+wUHnx8u3aY4hyLv6yLIseAkPl9S6yJX25 vnBg99CeZ5a0qP1y2UGoNgeWhD+ne0b3H+4TkO25tcbuxsR9XgJe1uBxsRPSKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1611163009; a=rsa-sha256; cv=none; b=bdYT9D5eJ9WdrzPdpRqeQvJ2458Qn40p5sohc/JXtrCt8v92evAMQRBBeH/Y4Ap/wp3WH5 dzlXEYjcTPlkEkUQOCG0529WMjYod5XhF4b4XnrlnZ/5NI2+2azcVPolfgmuLRTuV5PeD4 6HEVuEqrmh+6CXFmvzchOZDQrgg+TVckMWkOiAqkwt9qZy/ohetoJLWbaKmjrkQnSEJAKU j5cFH8z0n3thAXR3+lq0k3PLWQeBlQloSbs/KYa61X0aOWBdXex6S8dIMtdEXNUBc44ySM aNK38PAo+AjqDSqzSBMrqFjiNafr2E2Uglua6BFvYF/Sosl4ZPwJQvLu3yY47A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2021 17:16:49 -0000 --ucfHZChuBC0NsER/ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 20, 2021 at 07:46:46PM +0900, Yasuhiro Kimura wrote: > From: Yasuhiro Kimura > Subject: Re: git: 041b28524a3c - main - release: Add workaround to use SV= N for ports > Date: Wed, 20 Jan 2021 17:29:33 +0900 (JST) >=20 > > From: Glen Barber > > Subject: git: 041b28524a3c - main - release: Add workaround to use SVN = for ports > > Date: Tue, 19 Jan 2021 18:38:50 GMT > >=20 > >> The branch main has been updated by gjb: > >>=20 > >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D041b28524a3c69ff6e89306= 7df156c3faabcac9a > >>=20 > >> commit 041b28524a3c69ff6e893067df156c3faabcac9a > >> Author: Glen Barber > >> AuthorDate: 2021-01-19 18:38:33 +0000 > >> Commit: Glen Barber > >> CommitDate: 2021-01-19 18:38:33 +0000 > >>=20 > >> release: Add workaround to use SVN for ports > >> =20 > >> The ports tree is scheduled to be converted from Subversion to Git > >> after the currently-scheduled 13.0-RELEASE, so the source of truth > >> will be Subversion for the ports tree. > >> =20 > >> Implement a hack specifically for this case. > >=20 > > This change results in accessing 'svn://svn.freebsd.org/ports/head/head' > > and failing to check out ports tree. >=20 > Following patch fixes the problem. >=20 > diff --git a/release/release.sh b/release/release.sh > index 60034f12349..fbd64bb8234 100755 > --- a/release/release.sh > +++ b/release/release.sh > @@ -147,7 +147,7 @@ env_check() { > SRC=3D"${GITROOT}${GITSRC}" > DOC=3D"${GITROOT}${GITDOC}" > #PORT=3D"${GITROOT}${GITPORTS}" > - PORT=3D"svn://svn.freebsd.org/ports/${PORTBRANCH}" > + PORT=3D"svn://svn.freebsd.org/ports/" > =20 > if [ -n "${EMBEDDEDBUILD}" ]; then > WITH_DVD=3D >=20 Thank you very much. Committed as 5b0914aea27. Sorry for the breakage. Glen --ucfHZChuBC0NsER/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAmAIZXkACgkQAxRYpUeP 4pOYGw//Ugp3yN4tEpEUS9aNe65mEt7WhfehlV7ZWCFLUdYB+LcHdUOb8W6HOHjG tOhCM3qq/CQHaHS7VDIaQPCKYV8GQsrXRkiAKr9BXZw9oIe6J7cPy31ydmiJ2BvM SGO6RDyzgp2qpW3/UKW1FHNHgrJytJeQOdMvLIOmD5olXLMfiNMXlXtlJIhUNphH +yynMBmz1Hy0fFOo5i01V8TwDksv2jim00XnHyHHbhvLkKi+GqEaOVtdRYe4Shw+ kcP+Zt5F26NHKAn05l6QX51YF0+9Jq227G5Fx4h7+CdDoD1lIz12D+0vC8zlWoz8 Ur5IjhWqGZ1YONrS+KfZQPejqhRdyKi7QNNMR+rUD7U0POHig+0TB6FPdJRu6ozO aQvvAvSMKoQkqsYeHWhDsVIH0dInN73S9/YN8sINKD+/wZaZ+30FBGroGvnhopVU GbFOeOnt8LXqkexiDcdCoylGLvOO5BId2cR9HhAxJYzbs3dv3qdHbt/zbQndCGV7 y1MMhYXG8KAVAkoCWdGmP61glsqALdaNVnYOhkVUR/CPMqKVBjteoTB0hH9GX4Hd l6nrKR5n4TJ+l45QszDa7+OgSDaQI9Mx0KxEFm9W3Ru4YR8ygfWN9mEXXcCwEwST gy4T0ALsTPrJlaKe5k8jFUHhddxf3O5GLfJn2dVWnJnGW8FVkvo= =X9P7 -----END PGP SIGNATURE----- --ucfHZChuBC0NsER/--