From nobody Wed Nov 26 17:07:33 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 4dGmFy2YzJz6JKsS for ; Wed, 26 Nov 2025 17:07:34 +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 4dGmFx5z5Dz3lbn for ; Wed, 26 Nov 2025 17:07:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764176853; 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=HHdC18H7oyRRKhAuwQVV7hCn2RQA7Prkldw4GS35p1yFpEm8Gcb08kFqeSd5GXUQAwDFtB WYvqd/AGJ6+/ZRwrvshVfdIfCaQdjM4PQoeje6WqEsKKMm9RbWwkkGOqr5V3zJ63ufEUoX Czajk3C9nkLD6HUxNjBXks5iGPAI7F/txwf9K4ocpdLyG9OMPR01W9pI+u8KAp/cAGetdJ 1r19bpCIvW+ahjcKPp5oZvPPQBRKgo2pmJDkfwRKs15IJJlhwY+zSJcl6w3ntTsTYt+YhD Vz+u0+9s7A2GrvdZeX//i4O2E0dZ8DCqP2gytaYX1/0A1yzg6zhOTWpH6mH8yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764176853; 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=H5YEuwdIa/5k8hB5mgGmWgW/OhReJPHYtzV/qomCheZiE/WHzwyL/ewhXB7SHzOZuN8qf6 w7lV8fIeuXBJZ+O9yOqUtTZdsxc+ctXaK7c0/sNHe3Pya5JDh0privmUMcC3pQ5JHapKXU w1OF7ZXe6hateEs/yfPMKeiDuXkHtdcq3Szh4ZMcDv8xI4qzw2zJCxeG15EFHKYD3TaMwZ J+nNg99HFM54Q0lYvTb0wR/er8xBW08WWCqxRAegrG2r06XlwRoRZ9mjC27Qiv9Cum8S2Y E9Y1KfDb0u0iHmSv+yDG1wyU01egnWHyF53MVE9PifEXZc3SjKFFbslonaRbZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764176853; a=rsa-sha256; cv=none; b=nLhB2aIchFcT6+9fH79SYNHRiVhqg+NWm8YDOiUaFlzqjsPttDRzhZVmi1kWyz25YgprDS k5wiOaJ8bRuJ/lqs/gfSNXlLng/zPSa4nsUbW5ZrrLVjDcQ9s211J75xIRHpbI+YSmiRku WnEzEwtyfEF3gm805ve9Mm86dydzrBrh5oCjk9e/eKMB5cbeFZNZLaFHJ3KYf+VXxM0Hvi H0H86Ix/pNMHcwKqC/FLlx+6LIwA9L/hmirZHZLYNMWeC2aiWcLkxTcT8exNZfroxNCpqu Zhtowp0imAaJiz/6f6uJjhrLo6ZPvPs/mgAB5WKDaLqdWUc1kTy5G7QMIpA06g== 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 4dGmFx3yhhzw5D for ; Wed, 26 Nov 2025 17:07:33 +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 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/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}