Date: Thu, 14 Sep 2023 15:00:23 GMT From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 525c3ef318f8 - releng/14.0 - newvers.sh: Avoid picking up stray envars. Message-ID: <202309141500.38EF0Nu9089142@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/14.0 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=525c3ef318f8898e4bc61e815daa8f0a9ce3b948 commit 525c3ef318f8898e4bc61e815daa8f0a9ce3b948 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2023-09-13 18:10:46 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2023-09-14 09:00:16 +0000 newvers.sh: 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: https://reviews.freebsd.org/D41845 Approved by: re (gjb) (cherry picked from commit 9f16abf8d3561cb1a2c459eb6cb8fce06223c9b3) (cherry picked from commit f92a598782c2f671559a919f353b1505f6fe09ca) --- sys/conf/newvers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 81c35d40f6a3..9c894c4587da 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -57,6 +57,8 @@ BRANCH="BETA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi +unset RELEASE +unset VERSION if [ -z "${SYSDIR}" ]; then SYSDIR=$(dirname $0)/..
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309141500.38EF0Nu9089142>