From owner-dev-commits-src-all@freebsd.org Wed Jan 20 10:47:19 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 9E8BC4F16B7; Wed, 20 Jan 2021 10:47:19 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4DLMfZ01F3z4XvQ; Wed, 20 Jan 2021 10:47:17 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id BED344CAC8; Wed, 20 Jan 2021 19:47:12 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1611139632; bh=ie62pcZDkiga6czGAJzIaFu6YJ6QFbfraCYCovZcUCY=; h=Date:To:Cc:Subject:From:In-Reply-To:References; b=keJtNxugbZC8mPTEE/akUwjuQXIAPaEHerAQFcnkQq0Cp2YYSrrd70KSO1rQ+RH9l T04o9v62TNGANNT8kGmgIqVx4ujqv349Bi4hdKduOHMiHYHJzUQWa9vJxG9rSwJ9wY hkdxYeCrzMHe00gaB9VWO1Wa+wyBO+Tl9bpjh3cCJlxzASTimGbfkaWjye07qvzLlo wFrzRY+fGiZgcN2M7jriMydpccCOrGAPFu/UoReTPeXIF1dOMXHXWXrCZUCYORU8A0 LGoGLxI6cTstu1IvfnZMWvdP7p5TIe3zQjf3jTtsISPiC/UABl7lgT7SrIP3XPAnD4 qd4APE6phk0xA== Received: from localhost (rolling-vm-freebsd1.home.utahime.org [192.168.174.51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id 5DEAA4883C; Wed, 20 Jan 2021 19:47:11 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.0 at eastasia.home.utahime.org Date: Wed, 20 Jan 2021 19:46:46 +0900 (JST) Message-Id: <20210120.194646.2281393142538351130.yasu@utahime.org> To: gjb@FreeBSD.org 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 From: Yasuhiro Kimura In-Reply-To: <20210120.172933.1039050893851306070.yasu@utahime.org> References: <202101191838.10JIcorS044601@gitrepo.freebsd.org> <20210120.172933.1039050893851306070.yasu@utahime.org> X-Mailer: Mew version 6.8 on Emacs 27.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4DLMfZ01F3z4XvQ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=keJtNxug; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [-0.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[utahime.org]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[dev-commits-src-all,dev-commits-src-main] 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 10:47:19 -0000 From: Yasuhiro Kimura Subject: Re: git: 041b28524a3c - main - release: Add workaround to use SVN for ports Date: Wed, 20 Jan 2021 17:29:33 +0900 (JST) > From: Glen Barber > Subject: git: 041b28524a3c - main - release: Add workaround to use SVN for ports > Date: Tue, 19 Jan 2021 18:38:50 GMT > >> 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. > > This change results in accessing 'svn://svn.freebsd.org/ports/head/head' > and failing to check out ports tree. Following patch fixes the problem. 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="${GITROOT}${GITSRC}" DOC="${GITROOT}${GITDOC}" #PORT="${GITROOT}${GITPORTS}" - PORT="svn://svn.freebsd.org/ports/${PORTBRANCH}" + PORT="svn://svn.freebsd.org/ports/" if [ -n "${EMBEDDEDBUILD}" ]; then WITH_DVD= --- Yasuhiro Kimura