git: 525c3ef318f8 - releng/14.0 - Avoid picking up stray envars.

From: Dag-Erling Smørgrav <>
Date: Thu, 14 Sep 2023 15:00:23 UTC
The branch releng/14.0 has been updated by des:


commit 525c3ef318f8898e4bc61e815daa8f0a9ce3b948
Author:     Dag-Erling Smørgrav <>
AuthorDate: 2023-09-13 18:10:46 +0000
Commit:     Dag-Erling Smørgrav <>
CommitDate: 2023-09-14 09:00:16 +0000 Avoid picking up stray envars.
    89f361f742ae added a mechanism to allow arbitrary overrides from the
    command line.  Unfortunately, it also had the (likely unintended)
    effect of allowing RELEASE and VERSION to be passed in from the
    environment, and Makefile.inc1 happens to define VERSION for the
    benefit of pkgbase.  To restore the status quo, unset RELEASE and
    VERSION at the top of the script.
    Fixes:          89f361f742ae
    MFC after:      3 days
    Reviewed by:    gallatin, sjg, emaste
    Differential Revision:
    Approved by:    re (gjb)
    (cherry picked from commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3)
    (cherry picked from commit f92a598782c2f671559a919f353b1505f6fe09ca)
 sys/conf/ | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/conf/ b/sys/conf/
index 81c35d40f6a3..9c894c4587da 100644
--- a/sys/conf/
+++ b/sys/conf/
@@ -57,6 +57,8 @@ BRANCH="BETA1"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
+unset RELEASE
+unset VERSION
 if [ -z "${SYSDIR}" ]; then
 	SYSDIR=$(dirname $0)/..