From owner-dev-commits-src-main@freebsd.org Wed Dec 30 00:18:18 2020 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 1C0724CEFA5; Wed, 30 Dec 2020 00:18:18 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D5BhT4Y66z3r8D; Wed, 30 Dec 2020 00:18:17 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 0BU0I770079534; Tue, 29 Dec 2020 16:18:07 -0800 (PST) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 0BU0I7gn079533; Tue, 29 Dec 2020 16:18:07 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202012300018.0BU0I7gn079533@gndrsh.dnsmgr.net> Subject: Re: git: 70e64ba44941 - main - release.sh: Update GITROOT URL In-Reply-To: <202012291441.0BTEf1X9009764@gitrepo.freebsd.org> To: Glen Barber Date: Tue, 29 Dec 2020 16:18:07 -0800 (PST) CC: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4D5BhT4Y66z3r8D X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Wed, 30 Dec 2020 00:18:18 -0000 > The branch main has been updated by gjb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=70e64ba4494190e64ab8faa04d744182d420c275 > > commit 70e64ba4494190e64ab8faa04d744182d420c275 > Author: Glen Barber > AuthorDate: 2020-12-29 14:34:05 +0000 > Commit: Glen Barber > CommitDate: 2020-12-29 14:40:28 +0000 > > release.sh: Update GITROOT URL > > Hard-code the GITROOT for the ports tree to use cgit-beta > until the ports repository is converted. > > While here, remove $FreeBSD$ RCS IDs. So how do I know what version of some file I am looking at once it has been dis-associated from a git clone? Is there some new mechanism that can give me the cadence of say, /etc/pkg/FreeBSD.conf once its FreBSD ID is riped out? Also if $FreeBSD$ needs to be removed, can we please just do it in one massive tree wide commit rather than have this random piece wise needless noise in 1000's of commits? Thanks for information, Rod > > Sponsored by: Rubicon Communications, LLC (netgate.com) > --- > release/release.conf.sample | 4 +--- > release/release.sh | 7 +++---- > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/release/release.conf.sample b/release/release.conf.sample > index 615953adb111..bb9c8acb1b87 100644 > --- a/release/release.conf.sample > +++ b/release/release.conf.sample > @@ -1,7 +1,5 @@ > #!/bin/sh > # > -# $FreeBSD$ > -# > > ## Redefine environment variables here to override prototypes > ## defined in release.sh. > @@ -15,7 +13,7 @@ CHROOTDIR="/scratch" > ## Do not explicitly require the devel/git port to be installed. > #NOGIT=1 > ## Set the version control system host. > -GITROOT="https://cgit-beta.freebsd.org/" > +GITROOT="https://git.freebsd.org/" > GITSRC="src.git" > GITPORTS="ports.git" > GITDOC="doc.git" > diff --git a/release/release.sh b/release/release.sh > index 2ed76fa31c61..0975bdfed6b3 100755 > --- a/release/release.sh > +++ b/release/release.sh > @@ -34,8 +34,6 @@ > # totally clean, fresh trees. > # Based on release/generate-release.sh written by Nathan Whitehorn > # > -# $FreeBSD$ > -# > > export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin" > > @@ -75,7 +73,7 @@ env_setup() { > > # The default git checkout server, and branches for src/, doc/, > # and ports/. > - GITROOT="https://cgit-beta.FreeBSD.org/" > + GITROOT="https://git.FreeBSD.org/" > SRCBRANCH="main" > DOCBRANCH="main" > PORTBRANCH="main" > @@ -137,7 +135,8 @@ env_check() { > # Prefix the branches with the GITROOT for the full checkout URL. > SRC="${GITROOT}${GITSRC}" > DOC="${GITROOT}${GITDOC}" > - PORT="${GITROOT}${GITPORTS}" > + #PORT="${GITROOT}${GITPORTS}" > + PORT="https://cgit-beta.freebsd.org/ports.git" > > if [ -n "${EMBEDDEDBUILD}" ]; then > WITH_DVD= > -- Rod Grimes rgrimes@freebsd.org