svn commit: r365638 - head/release
Glen Barber
gjb at FreeBSD.org
Fri Sep 11 17:04:10 UTC 2020
Author: gjb
Date: Fri Sep 11 17:04:09 2020
New Revision: 365638
URL: https://svnweb.freebsd.org/changeset/base/365638
Log:
Add a NOGIT option to avoid explicitly requiring devel/git if the
sources are obtained through a different mechanism.
Reported and tested by: Ruslan Garipov
Sponsored by: Rubicon Communications, LLC (netgate.com)
Modified:
head/release/release.conf.sample
head/release/release.sh
Modified: head/release/release.conf.sample
==============================================================================
--- head/release/release.conf.sample Fri Sep 11 16:13:45 2020 (r365637)
+++ head/release/release.conf.sample Fri Sep 11 17:04:09 2020 (r365638)
@@ -12,6 +12,8 @@
## Set the directory within which the release will be built.
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/"
GITSRC="src.git"
Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh Fri Sep 11 16:13:45 2020 (r365637)
+++ head/release/release.sh Fri Sep 11 17:04:09 2020 (r365638)
@@ -65,7 +65,7 @@ env_setup() {
[ ! -z "${VCSCMD}" ] && break 2
done
- if [ -z "${VCSCMD}" ]; then
+ if [ -z "${VCSCMD}" -a -z "${NOGIT}" ]; then
echo "*** The devel/git port/package is required."
exit 1
fi
@@ -275,6 +275,7 @@ extra_chroot_setup() {
cp ${SRC_CONF} ${CHROOTDIR}/${SRC_CONF}
fi
+ if [ -z "${NOGIT}" ]; then
# Install git from ports or packages if the ports tree is
# available and VCSCMD is unset.
_gitcmd="$(which git)"
@@ -299,6 +300,7 @@ extra_chroot_setup() {
pkg install -y devel/git
eval chroot ${CHROOTDIR} env ASSUME_ALWAYS_YES=yes \
pkg clean -y
+ fi
fi
if [ -d ${CHROOTDIR}/usr/ports ]; then
# Trick the ports 'run-autotools-fixup' target to do the right
More information about the svn-src-head
mailing list