system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-23 19:28:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

release: Add workaround to use SVN for ports

Browse source 
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)
This commit is contained in:
Glen Barber 2021-01-19 13:38:33 -05:00
parent fa6662b368
commit 041b28524a
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
release/release.sh
View file

@ -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