diff options
author | Glen Barber <gjb@FreeBSD.org> | 2020-09-11 17:04:09 +0000 |
---|---|---|
committer | Glen Barber <gjb@FreeBSD.org> | 2020-09-11 17:04:09 +0000 |
commit | 91ce469984500aa994c85640e0af129e3e0c938f (patch) | |
tree | 30377c216a542bbeba4c5a893b44a4e0daf32ac8 /release | |
parent | 0f8c7ba2757db59b247f39f0be69af3d88bf7ab6 (diff) | |
download | src-test-91ce469984500aa994c85640e0af129e3e0c938f.tar.gz src-test-91ce469984500aa994c85640e0af129e3e0c938f.zip |
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)
Notes
Notes:
svn path=/head/; revision=365638
Diffstat (limited to 'release')
-rw-r--r-- | release/release.conf.sample | 2 | ||||
-rwxr-xr-x | release/release.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/release/release.conf.sample b/release/release.conf.sample index 260c8c37227a8..615953adb1114 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -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" diff --git a/release/release.sh b/release/release.sh index ed83bdd7d1bf3..93d4a2f9f5ba9 100755 --- a/release/release.sh +++ b/release/release.sh @@ -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)" @@ -300,6 +301,7 @@ extra_chroot_setup() { 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 # thing. |