From nobody Thu Nov 27 01:56:13 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 4dGzzy0RzGz6J41k for ; Thu, 27 Nov 2025 01:56:14 +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 4dGzzx3fjtz3CjG for ; Thu, 27 Nov 2025 01:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764208573; 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=2/LUPwQxPRTSXmI808NpY0hb25+XMC30QCsmt/v+JaQ=; b=db+NF4DylzAMip+ztU3VPBGu+0iG4V7jWII1LHhl25BC5AQVY8i4pmBqqPRXN7UdpyWHdN WtxmzZp0VD0zNofjI4czqnrUN+kpevBDUrwJmO0MXd8xoESAdczEj6QRouwp9PH3+Od0l+ L8V4TKSfjZrJl4fwN8KQfi6tWnzcPO3OZOhrVZeFWX6rZfiybE+oBk5QE9d+s/0b0QEu5u Et32R1v1c1s2n9x/Ec+xXOmQsU7cn5uDkEbpJm4BMsgL+ukiJo8jk2upHwk5iqur1Tw7MT jY3uALyehc+DrHfStnYzHIjqGViKinAWB9q7dpscLcg15/7ab8Jj2DSB85jh6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764208573; 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=2/LUPwQxPRTSXmI808NpY0hb25+XMC30QCsmt/v+JaQ=; b=e6c0ykgSciqs34Oyx18+NsTgHs85FM3CLd5SaFjpkTfTYWPFgrO8G2kg9tFdygK1aDiu7L gL9G9pWMnGxzMAHe0bf8g2LTcycx8/tTyGRiR8P4rWUHwOwV6V8HuLQfh0B8rmkDsNl7US lQalgfglMMpj4QWGh0qIZO2IUfN0AwW/Pqfxy/7RRtVEVuWbJPBwm+l4iROUqnEW+DzoYv ebywFVqY+ggdjlm8zINhYmo8lAtUv2jTtUF0OCG2Pm+X+9EwTrhOz3s0RGTMhjHo1sYPwM MvCRxOj3ITuZYADdFRTdphnl8M9HdrH8RQFU+0XOh4xiNTLLmmIn3STTpztbbQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764208573; a=rsa-sha256; cv=none; b=JvWK1amknyTc5Y0sTa1mND8yrGAyGlezJb9zceeHQ4AB9RZBq2CaVQ3jLkV1n6qwkAwU2a ALl2CD9YnloiOY0rYPHiGGIYY/L9LTXb9aR5+UTc1JyyqPCz1ne7DnQBYgVgETiGfePGqU 2y5Ys1Kep5uPfMU3MMBw/K+6XLL/aPqGDilgMMLxf6vI4d1wcO8/LA2h0H6i18k8CJjo6l Etgoew1OuLJyCVdW2HqCa5M5BBrLKxpAGEnxeMOr67yppFvWvD/COcZ1XBO+HTWJp1Vzap VvP5dWqRVaJ20kdX0NBO3K2fEFrPa8VZwFVIb1pzEuHdsJFFB72QXqEfxj/MrQ== 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 4dGzzx2x48z1B5q for ; Thu, 27 Nov 2025 01:56:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2951e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 27 Nov 2025 01:56:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 56275b7b0672 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 56275b7b06726aa530c1bcab176d225d5d4b7893 Auto-Submitted: auto-generated Date: Thu, 27 Nov 2025 01:56:13 +0000 Message-Id: <6927afbd.2951e.2541247@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=56275b7b06726aa530c1bcab176d225d5d4b7893 commit 56275b7b06726aa530c1bcab176d225d5d4b7893 Author: Colin Percival AuthorDate: 2025-11-26 03:33:22 +0000 Commit: Colin Percival CommitDate: 2025-11-27 01:56:02 +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. MFC after: 1 day (cherry picked from commit d45816f369eb0099fd274fee23a3bf137ee794b1) --- 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}