git: 70e64ba44941 - main - release.sh: Update GITROOT URL
Glen Barber
gjb at FreeBSD.org
Tue Dec 29 14:41:01 UTC 2020
The branch main has been updated by gjb:
URL: https://cgit.FreeBSD.org/src/commit/?id=70e64ba4494190e64ab8faa04d744182d420c275
commit 70e64ba4494190e64ab8faa04d744182d420c275
Author: Glen Barber <gjb at FreeBSD.org>
AuthorDate: 2020-12-29 14:34:05 +0000
Commit: Glen Barber <gjb at FreeBSD.org>
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=
More information about the dev-commits-src-main
mailing list