Date: Thu, 17 Sep 2020 16:09:38 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365838 - stable/12/sys/conf Message-ID: <202009171609.08HG9cb0017197@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Sep 17 16:09:38 2020 New Revision: 365838 URL: https://svnweb.freebsd.org/changeset/base/365838 Log: MFC r365646, r365720: r365646: Enclose BRANCH_OVERRIDE in quotes in order to fix an issue with freebsd-update(8) builds, where BRANCH is suffixed with -p0 for builds. r365720 (gordon): Partially revert r346018 and use the if/then construct instead of shell. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: stable/12/sys/conf/newvers.sh Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/conf/newvers.sh ============================================================================== --- stable/12/sys/conf/newvers.sh Thu Sep 17 15:58:42 2020 (r365837) +++ stable/12/sys/conf/newvers.sh Thu Sep 17 16:09:38 2020 (r365838) @@ -49,7 +49,10 @@ TYPE="FreeBSD" REVISION="12.2" -BRANCH=${BRANCH_OVERRIDE:-STABLE} +BRANCH="STABLE" +if [ -n "${BRANCH_OVERRIDE}" ]; then + BRANCH=${BRANCH_OVERRIDE} +fi RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009171609.08HG9cb0017197>