Date: Mon, 14 Sep 2020 14:45:31 +0000 (UTC) From: Gordon Tetlow <gordon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365720 - head/sys/conf Message-ID: <202009141445.08EEjVY5092564@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gordon Date: Mon Sep 14 14:45:30 2020 New Revision: 365720 URL: https://svnweb.freebsd.org/changeset/base/365720 Log: Partially revert r346018 and use the if/then construct instead of shell. There are a couple of places in the tree that directly parse the newvers.sh script looking for the BRANCH variable. I found two locations, one in release/Makefile and the other in bin/freebsd-version/Makefile. While there is a good argument that BRANCH_OVERRIDE should properly propagate in those circumstances and the new behavior is thus better, the reality is this change broke freebsd-update's ability to find timestamps in binaries and resulted in a large number of gratuitous changes. Reported by: freebsd-update Discussed with: cperciva MFC after: 1 day Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Mon Sep 14 14:24:54 2020 (r365719) +++ head/sys/conf/newvers.sh Mon Sep 14 14:45:30 2020 (r365720) @@ -54,7 +54,10 @@ TYPE="FreeBSD" REVISION="13.0" -BRANCH="${BRANCH_OVERRIDE:-CURRENT}" +BRANCH="CURRENT" +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?202009141445.08EEjVY5092564>