From nobody Mon Dec 16 00:39:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YBLg50nyNz5gZFc; Mon, 16 Dec 2024 00:39:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YBLg50Dxsz3wZk; Mon, 16 Dec 2024 00:39:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734309569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrcj6n8Wq1Z+4x8V4UoQSx8U7J2WVjrurC6AnOIaxIw=; b=dIz0PT5Tfjvm+uAfDRETRwEj2OoEhohhhGxhpleGqopwZKY4xAOAAHk76qwlMTtOdZrE7z gjjOMgC4AE7ioc/e/+IBOChbhRJviduSyaZU2x4hywvozQyHSlxBfzIWu0I/Keu5W8V3If e2cSultiweDTH0icyt2+2030TEE/b3pM0J3AtaxTWKlvgMUP8gd+rXUD1S2AQkd9hji9Vd nstO3f/7jzn1quCuLgqM8aNaCeHV/2pGTIW/PVMWHtJ+ZLpFV2NwkGiisCX8/wIrINUTiV DXM7FOhXbIurx/pCsk1R50vipqnqnR2l26s2239Wi3BbCdm9xF9xbdnm3BEPKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734309569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jrcj6n8Wq1Z+4x8V4UoQSx8U7J2WVjrurC6AnOIaxIw=; b=x/1biG4Uj71YoAOtnoAN3i4l5vnzbEGMF0Wl6yYFFuIneNqippltQjgx9moAL27Mhadlow N9AewJE5RqV0CXjNGWAgvmpcbGxq1fqjPOdDlf+NvW24qIrXeN2EfiEHrY1tejgTqGUEnv em47sEL+JM9Sf2uQB+HGV83/PzpbaLdwgQbva4uRMTmWcTzlaWSA8sypTvSjuQjT+qHr8e sRHtpKYpkFY6UzeJgj6oqwe8/L/Aw07k7vEdqiptvT5vJPkLWO5aVfUmd00XYCdUeVjMJs hBUBeuQmNoQePIdukIx6kt7BePtx41hmTZtNx8v35IZn3VIVgqkckLxQrPXLFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734309569; a=rsa-sha256; cv=none; b=XhHH112GeVn9Rh1+u9bVGCQIbY5wHCx/KKTeVL9y68MHk8rwblR14BoJ7mg4gR/vf0xVKj 3WvqOYgxvVRc5P/2Qj26YMvyk/TCWiHy3Za1rCcrjEIB+b/V5BKTjwf7JvPLVQzsIm+koo wCPA2JsawtqiGhiMx+QMEBdD8c+tegn2NK4pZnEMpR0/5B8sPFSysUSM6pUx3BkFnwRh6f EhpvkQTE7IBspt114rzmhM7OocNfa1W/TvV27XFU9bOpeNiNH/vcITnpsBLcUJrme7g5Eb PQlLcjZ/9zR6DnM27PhJwvP4JN5hRfZPbpaY7tphkGPJUAox30QWCSylRcMpMg== 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 4YBLg46X9KzWxg; Mon, 16 Dec 2024 00:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BG0dSHr066428; Mon, 16 Dec 2024 00:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BG0dSvs066425; Mon, 16 Dec 2024 00:39:28 GMT (envelope-from git) Date: Mon, 16 Dec 2024 00:39:28 GMT Message-Id: <202412160039.4BG0dSvs066425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d6b36d1c83fb - stable/14 - newvers: Set explicit git revision length List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d6b36d1c83fbfc8046efa7acb32b676824f6bc8f Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d6b36d1c83fbfc8046efa7acb32b676824f6bc8f commit d6b36d1c83fbfc8046efa7acb32b676824f6bc8f Author: Pat Maddox AuthorDate: 2024-12-13 05:28:18 +0000 Commit: Ed Maste CommitDate: 2024-12-16 00:39:08 +0000 newvers: Set explicit git revision length The --short flag is configurable. Setting an explicit length supports reproducible builds. Signed-off-by: Pat Maddox Reviewed by: emaste, imp Differential Revision: https://github.com/freebsd/freebsd-src/pull/1547 (cherry picked from commit a1097094c4c5d810287aca092f4ab5f9f86a426a) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index c77c3818c566..3ff993bdd2ab 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -257,7 +257,7 @@ if [ -n "$svnversion" ] ; then fi if [ -n "$git_cmd" ] ; then - git=$($git_cmd rev-parse --verify --short HEAD 2>/dev/null) + git=$($git_cmd rev-parse --verify --short=12 HEAD 2>/dev/null) if [ "$($git_cmd rev-parse --is-shallow-repository)" = false ] ; then git_cnt=$($git_cmd rev-list --first-parent --count HEAD 2>/dev/null) if [ -n "$git_cnt" ] ; then