From owner-dev-commits-src-main@freebsd.org Tue Jan 19 18:38:51 2021 Return-Path: Delivered-To: dev-commits-src-main@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 2D5274DACE0; Tue, 19 Jan 2021 18:38:51 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DKy970Wmwz4VwN; Tue, 19 Jan 2021 18:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 04C07304A; Tue, 19 Jan 2021 18:38:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10JIcoFQ044602; Tue, 19 Jan 2021 18:38:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10JIcorS044601; Tue, 19 Jan 2021 18:38:50 GMT (envelope-from git) Date: Tue, 19 Jan 2021 18:38:50 GMT Message-Id: <202101191838.10JIcorS044601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: 041b28524a3c - main - release: Add workaround to use SVN for ports MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 041b28524a3c69ff6e893067df156c3faabcac9a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jan 2021 18:38:51 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=041b28524a3c69ff6e893067df156c3faabcac9a commit 041b28524a3c69ff6e893067df156c3faabcac9a Author: Glen Barber AuthorDate: 2021-01-19 18:38:33 +0000 Commit: Glen Barber CommitDate: 2021-01-19 18:38:33 +0000 release: Add workaround to use SVN for ports 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. Implement a hack specifically for this case. Sponsored by: Rubicon Communications, LLC (netgate.com) --- release/release.sh | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/release/release.sh b/release/release.sh index 0975bdfed6b3..15c94ca9328e 100755 --- a/release/release.sh +++ b/release/release.sh @@ -65,6 +65,17 @@ env_setup() { [ ! -z "${VCSCMD}" ] && break 2 done + # Find the Subversion binary to use. This is a workaround to use + # the source of truth for the ports tree, as the conversion to Git + # is targeted to occur slightly after the currently-scheduled 13.0 + # release. + for _dir in /usr/bin /usr/local/bin; do + for _svn in svn svnlite; do + [ -x "${_dir}/${_svn}" ] && SVNCMD="${_dir}/${_svn}" + [ ! -z "${SVNCMD}" ] && break 2 + done + done + if [ -z "${VCSCMD}" -a -z "${NOGIT}" ]; then echo "*** The devel/git port/package is required." exit 1 @@ -76,7 +87,7 @@ env_setup() { GITROOT="https://git.FreeBSD.org/" SRCBRANCH="main" DOCBRANCH="main" - PORTBRANCH="main" + PORTBRANCH="head" GITSRC="src.git" GITPORTS="ports.git" GITDOC="doc.git" @@ -136,7 +147,7 @@ env_check() { SRC="${GITROOT}${GITSRC}" DOC="${GITROOT}${GITDOC}" #PORT="${GITROOT}${GITPORTS}" - PORT="https://cgit-beta.freebsd.org/ports.git" + PORT="svn://svn.freebsd.org/ports/${PORTBRANCH}" if [ -n "${EMBEDDEDBUILD}" ]; then WITH_DVD= @@ -238,7 +249,10 @@ chroot_setup() { if [ -d "${CHROOTDIR}/usr/ports/.git" ]; then git -C ${CHROOTDIR}/usr/ports pull -q else - ${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports + #${VCSCMD} ${PORT} -b ${PORTBRANCH} ${CHROOTDIR}/usr/ports + # XXX: Workaround for the overlap in the Git + # conversion timeframe. + ${SVNCMD} co ${PORT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports fi fi