From nobody Wed Nov 26 17:07:33 2025 X-Original-To: dev-commits-src-main@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 4dGmG25ts2z6JKsV for ; Wed, 26 Nov 2025 17:07:38 +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 4dGmG24P0yz3lLH for ; Wed, 26 Nov 2025 17:07:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764176858; 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=KMJ3SY5xQZDqPiQaZc/hCBAqnfXXpRe6lTi7n9DZm3Q=; b=HUoRhhOxtBIrB4rHfqxmesQWYgdf06O7jImb3fDS25fbuoN4F5zI7yS1vS2l9ohOz/esWq k9gtiL17/Tu541037PiitbrOpJFQa+7LHfhq5rsc4tjMHcrtO0t0aYG4m4arHpEEYMF5Ix Cd4L0r1o3f5b2a9UILpWp3cW1HndsVn3bqrT3T9FaUo88+O2z7AgDuyZLFORdYsIw9uFC4 9qThlnk3eZT6Qg+i3FuRIoCv212ZTBLgsP6R0SyLJWgfbyzlhO6nLEEbaL9i5aNoQ4DCSk VccVC5HKWRlqkxD8yVsS3S+hbQfRVvWDcQIbPU1eHdVJj8NNe3q1XkIgKFt6LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764176858; 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=KMJ3SY5xQZDqPiQaZc/hCBAqnfXXpRe6lTi7n9DZm3Q=; b=KVC5cWBbt4ioqCoVxzV19NA5hXBcuIrIJfQYw5Jcybj99BV+251b3Xfq+zL6zFskABNR70 NSGtFI1pwMS+L4WWHHKp5ao/i40GAnzrpyjrJ7l0BW8ebIdcaZM5dvnRDkSPpCoVXK4w7J sLOrTfvG/+nPpm792DN6kCMuOY2CVkRaf8P3st0XmIJ6pzwsVF5KVs9dEP88UO/VuQiuSL P16r/eBV3ksmJUC9JItNc6UXs81Q0vy2eeeny8jiFXo2kV39FMdX3W7IgPjCaJXsfNgxq/ 6PmR2qWB/4j+efnBypCAvFcazi32PDvFYm7T8AntZYFYUoroE4vBDUKGd0FdjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764176858; a=rsa-sha256; cv=none; b=v9O+ixLyX1ooQm9kSp+GnTSmJJaT6vMkfJwDofmf3xKtXS5tHZ6rO4dk9y2vyLeko0g8rs /TaNM8kFjlBLb9EnSzvDX0LqHhGcEkj6JlvPt1UcbJNsucl+7Bzuk9vlqOTs67gXxAjKXg pbwvnLHUckqXSlgaaqqWWOGaMkYrVvF81fDKB0GWTFqy+myFntri11J/RiSGPEI41XPP/I 3EuX1qqCYdGsMDY+WBHtVlpo3uBq2HJgOjjJ7qxBrXJbSwS0cCx7f3wwPN1PJ1ZbQ3bDAv EU0/iLm1jko549+8r1wnzhZh3kZl5m2EYhGfns4dLTLG2w8lb3m/wBzXVwQ6uQ== 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 4dGmG23x6Xzvnf for ; Wed, 26 Nov 2025 17:07:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 9bfc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 26 Nov 2025 17:07:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: d45816f369eb - main - bsdinstall: Ignore -p[0-9]+ in determining BRANCH List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d45816f369eb0099fd274fee23a3bf137ee794b1 Auto-Submitted: auto-generated Date: Wed, 26 Nov 2025 17:07:33 +0000 Message-Id: <692733d5.9bfc.1b23097d@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d45816f369eb0099fd274fee23a3bf137ee794b1 commit d45816f369eb0099fd274fee23a3bf137ee794b1 Author: Colin Percival AuthorDate: 2025-11-26 03:33:22 +0000 Commit: Colin Percival CommitDate: 2025-11-26 17:07:24 +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 --- 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}