From owner-dev-commits-src-main@freebsd.org Tue Dec 29 14:41:01 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 6FDA44C1164; Tue, 29 Dec 2020 14:41:01 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D4xtP2p8cz4fC2; Tue, 29 Dec 2020 14:41:01 +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 485D158B3; Tue, 29 Dec 2020 14:41:01 +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 0BTEf1RC009765; Tue, 29 Dec 2020 14:41:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BTEf1X9009764; Tue, 29 Dec 2020 14:41:01 GMT (envelope-from git) Date: Tue, 29 Dec 2020 14:41:01 GMT Message-Id: <202012291441.0BTEf1X9009764@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: 70e64ba44941 - main - release.sh: Update GITROOT URL 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: 70e64ba4494190e64ab8faa04d744182d420c275 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, 29 Dec 2020 14:41:01 -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. 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=