From owner-svn-src-head@freebsd.org Mon Sep 14 14:45:31 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 77F3A3D85DE; Mon, 14 Sep 2020 14:45:31 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bqq0W2cpgz3XBJ; Mon, 14 Sep 2020 14:45:31 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 399BB18D03; Mon, 14 Sep 2020 14:45:31 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08EEjViu092565; Mon, 14 Sep 2020 14:45:31 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08EEjVY5092564; Mon, 14 Sep 2020 14:45:31 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202009141445.08EEjVY5092564@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Mon, 14 Sep 2020 14:45:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365720 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 365720 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2020 14:45:31 -0000 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}"