From owner-svn-src-head@freebsd.org Wed Dec 16 18:40:50 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 8B3304C3CF1; Wed, 16 Dec 2020 18:40:50 +0000 (UTC) (envelope-from gjb@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 4Cx3q63QT5z3mdt; Wed, 16 Dec 2020 18:40:50 +0000 (UTC) (envelope-from gjb@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 6861D2DC3; Wed, 16 Dec 2020 18:40:50 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BGIeogd029542; Wed, 16 Dec 2020 18:40:50 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BGIenOJ029539; Wed, 16 Dec 2020 18:40:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202012161840.0BGIenOJ029539@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 16 Dec 2020 18:40:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368704 - head/release X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release X-SVN-Commit-Revision: 368704 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.34 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: Wed, 16 Dec 2020 18:40:50 -0000 Author: gjb Date: Wed Dec 16 18:40:49 2020 New Revision: 368704 URL: https://svnweb.freebsd.org/changeset/base/368704 Log: Append the branch commit count to _SNAP_SUFFIX for development snapshot builds. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: head/release/Makefile.inc1 head/release/Makefile.mirrors Modified: head/release/Makefile.inc1 ============================================================================== --- head/release/Makefile.inc1 Wed Dec 16 18:01:41 2020 (r368703) +++ head/release/Makefile.inc1 Wed Dec 16 18:40:49 2020 (r368704) @@ -21,11 +21,17 @@ GITBRANCH!= ${GIT_CMD} -C ${.CURDIR} rev-parse --abbre GITREV!= ${GIT_CMD} -C ${.CURDIR} rev-parse --verify --short HEAD 2>/dev/null || true . export GITREV . endif +. if !defined(GITCOUNT) || empty(GITCOUNT) +GITCOUNT!= ${GIT_CMD} -C ${.CURDIR} rev-list --count HEAD 2>/dev/null || true +. export GITCOUNT +. endif .else GITBRANCH= nullbranch GITREV= nullhash +GITCOUNT= nullcount . export GITBRANCH . export GITREV +. export GITCOUNT .endif # Set the build date, primarily for snapshot builds. Modified: head/release/Makefile.mirrors ============================================================================== --- head/release/Makefile.mirrors Wed Dec 16 18:01:41 2020 (r368703) +++ head/release/Makefile.mirrors Wed Dec 16 18:40:49 2020 (r368704) @@ -33,7 +33,7 @@ TLD?= ${FTPDIR}/snapshots .if !defined(BUILDDATE) || empty(BUILDDATE) BUILDDATE!= date +%Y%m%d .endif -_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV} +_SNAP_SUFFIX:= ${BUILDDATE}-${GITREV}-${GITCOUNT} .else # release SNAPSHOT=