aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2021-01-19 18:38:33 +0000
committerGlen Barber <gjb@FreeBSD.org>2021-01-19 18:38:33 +0000
commit041b28524a3c69ff6e893067df156c3faabcac9a (patch)
tree68a8e0d3f8e332be62fe7ef1900243e588a371f0 /release
parentfa6662b3689eeb71cb63c2b230ca08e7342cabf0 (diff)
downloadsrc-041b28524a3c69ff6e893067df156c3faabcac9a.tar.gz
src-041b28524a3c69ff6e893067df156c3faabcac9a.zip
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)
Diffstat (limited to 'release')
-rwxr-xr-xrelease/release.sh20
1 files 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