From owner-dev-commits-src-all@freebsd.org Fri Jan 8 22:37:43 2021 Return-Path: Delivered-To: dev-commits-src-all@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 712364D90A2; Fri, 8 Jan 2021 22:37:43 +0000 (UTC) (envelope-from git@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 4DCHzq2q3lz3NDk; Fri, 8 Jan 2021 22:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4F0AE3138; Fri, 8 Jan 2021 22:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 108MbhjO068571; Fri, 8 Jan 2021 22:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 108MbhVN068570; Fri, 8 Jan 2021 22:37:43 GMT (envelope-from git) Date: Fri, 8 Jan 2021 22:37:43 GMT Message-Id: <202101082237.108MbhVN068570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bryan Drewery Subject: git: 44b8b2a00d7e - main - Makefile.inc1: Avoid using release/Makefile for VERSION. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44b8b2a00d7e2e98c83141a5c0e6b9b4e3c2ddb4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2021 22:37:43 -0000 The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=44b8b2a00d7e2e98c83141a5c0e6b9b4e3c2ddb4 commit 44b8b2a00d7e2e98c83141a5c0e6b9b4e3c2ddb4 Author: Bryan Drewery AuthorDate: 2020-12-16 20:34:38 +0000 Commit: Bryan Drewery CommitDate: 2021-01-08 22:33:35 +0000 Makefile.inc1: Avoid using release/Makefile for VERSION. release/Makefile.inc1 has git executions that were being ran for each of these lookups. The results were not needed so just lookup what we want directly instead. Reviewed by: gjb, rlibby, emaste (maybe) Sponsored by: Dell EMC Differential Revision: https://reviews.freebsd.org/D27643 --- Makefile.inc1 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index c4e656c79ceb..5a9eff870dd5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -540,14 +540,12 @@ OSRELDATE= 0 .endif # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. -.if !defined(_REVISION) -_REVISION!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V REVISION -.export _REVISION -.endif -.if !defined(_BRANCH) -_BRANCH!= ${MAKE} -C ${SRCDIR}/release MK_AUTO_OBJ=no -V BRANCH -.export _BRANCH +.for _V in BRANCH REVISION +.if !defined(_${_V}) +_${_V}!= eval $$(awk '/^${_V}=/{print}' ${SRCTOP}/sys/conf/newvers.sh); echo $$${_V} +.export _${_V} .endif +.endfor .if !defined(SRCRELDATE) SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ ${SRCDIR}/sys/sys/param.h