From nobody Thu Nov 27 01:57:47 2025 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 4dH01m1T8dz6J3v2 for ; Thu, 27 Nov 2025 01:57:48 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dH01m0N91z3D1g for ; Thu, 27 Nov 2025 01:57:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764208668; 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=lL1idqUAVYX+AnDcxmZvyn5Sewc6Le93zGDRxhtn1Lg=; b=i6cANf/EcUhq0G23s++lKpR2V+4VVGn+CkO9BoHyj1C7oMNt/dh7JHgy2Oz1FQrY9e74jJ DtF1VOr9CODf0YDFH/QMnpSn1vv6BjMMG35XXAfTLUAuWzvV1jcFJl/WPdRW95KZxYCC4f 10duDyTfunGjqhBgOa4Ss+DuLqxpJMdex5IF6QvNof/SB8EFbBXeyQ5992QgIeqEZQk1Jq jsG+x6qgWSCnSWcESS0FouvrnTSmsNGsMnVE9ypATnD1WEAIdOJ5iVyWXQwRTFa6wgnXHq Pe0cfpxIzrqM6gxEsu3NMlD0gTOJS1ZfCI5mFniYnbpAtRO0BmUvyF45HeaQHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764208668; 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=lL1idqUAVYX+AnDcxmZvyn5Sewc6Le93zGDRxhtn1Lg=; b=TtZ/AV2xmAkusORK1WEBypR5cmSYBclQSu/k76MiTPq0sxTLW69LHktJjJBugJ4Yu+FIuR RSjAL5qbPAQShJ3R4eh6nzjZt2AKWi9VfrkeiODxDTfAPLuj2wjHyWxco+u1GHjKxW9Dcz RarFQaE0aKPWfJx73YLB/ntsMkO68SK9H+cYS0/yarrT2Q8vjtjHhFfcGtJGqft8W8DyiG y2vvKWeCicQOg8Uo09UX3By6x5mDvJwH3XcfqdsEYl47MxaXQ7JUQDEV1tz9Ca40LbHfko 2pp1RKEk6oECOEk9mDClTlL2jbSH1FBPw9lNg/JeTNB8MEBKT+qPQjtDEG/8mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764208668; a=rsa-sha256; cv=none; b=eahfNS3aVhWWHHXAnfdV0EdzWptUF5DzrVQ0SpfA5kXomeJwGKpI18dgCujAsOGc0CUIR6 ccZuEN8s7TjXMnOyWNGWSQxuK17eB2y5tj9BX9X271yPy0JJFuw/RslmsoyRLBMSwKXIDZ L0jA26TeDs1RVL2QQD7inrwnoKBCSp4o1VEuGTCGUfvDeU/61L8El9DSAL598/5AhWu01p bGLQhX0fDph0A+74P7/veWQzwcEwn5VaLpjbvDb+xeGpCUhX7KuwrNRiXbEAS7rlbN3Lxg V/7CzQcc8rrhrcnS8TQ3hycm9Wjdh1lt0U2YfTfWhAEXe7Myak1aZNDQuRrLGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dH01l6v8tz1BN6 for ; Thu, 27 Nov 2025 01:57:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2a801 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Nov 2025 01:57:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f73d78e3ff12 - releng/15.0 - bsdinstall: Ignore -p[0-9]+ in determining BRANCH 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: f73d78e3ff1295d3227849ac993d4b2e5f206d6d Auto-Submitted: auto-generated Date: Thu, 27 Nov 2025 01:57:47 +0000 Message-Id: <6927b01b.2a801.3cca8d7@gitrepo.freebsd.org> The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f73d78e3ff1295d3227849ac993d4b2e5f206d6d commit f73d78e3ff1295d3227849ac993d4b2e5f206d6d Author: Colin Percival AuthorDate: 2025-11-26 03:33:22 +0000 Commit: Colin Percival CommitDate: 2025-11-27 01:57:20 +0000 bsdinstall: Ignore -p[0-9]+ in determining BRANCH The patch level is not part of the branch per se and should not be used in constructing the FreeBSD-base.conf file used by bsdinstall. Approved by: re (cperciva) MFC after: 1 day (cherry picked from commit d45816f369eb0099fd274fee23a3bf137ee794b1) (cherry picked from commit 56275b7b06726aa530c1bcab176d225d5d4b7893) --- usr.sbin/bsdinstall/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index 9a6b25fc5c7a..a576f2d0794e 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -16,7 +16,7 @@ FILESDIR= ${SHAREDIR}/bsdinstall FILES= FreeBSD-base.conf _BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH -BRANCH?= ${_BRANCH} +BRANCH?= ${_BRANCH:C/-p[0-9]+$//} _REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION REVISION?= ${_REVISION}