From nobody Wed Jul 30 22:57:35 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 4bsnfl4l4dz637rm; Wed, 30 Jul 2025 22:57:35 +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 4bsnfl45x4z3mJg; Wed, 30 Jul 2025 22:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753916255; 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=NJQ9Pkie3vqA/Q2EV3T077b8k+r3CyAOLJ0mmScslIw=; b=kaPc4cFTlu6eyNRF0VBToqYKAhsP8KvtG3fl/YGnYDhMSAM0xuE+6bCN94VgH3p9vp04+8 WmN3YAfEACXinU5C0DGwCEZkZG7HsTO2Gdurn5ZKy2bKbL2OXavt0eCs2M3jNgs9iWQkp8 hWnYVS661GGmGUCLnVVsBHD8ZC5iJo8hrQgEwrzyGGQuDjATreMU95Ugo4SYd4/8GLrkt9 Gf01seguaSZPWEOE0iRZ/OVLZCNy1p7LnvXLekJsahUfC5HffPnkcKRZp+gMnWdKipO2pK xBCs6BI5ehnCFIbJ+OhQWyv0fnSUBPNdeX7/ON6IRiYBhX2McqCCZOVAS/Sn6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753916255; 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=NJQ9Pkie3vqA/Q2EV3T077b8k+r3CyAOLJ0mmScslIw=; b=NyoXjWWewMKGUi+ZmhC0F9U3nwwRWFndmAW4KpQp8Y7kpLrwKG8UU8ygCWEabmsnHS8VnC QFcHHyT2FjttRdXNMPimy/UPyIqEkIQtSpr6B1EVxbN/UbdWMZS5REDLHH1oKGCDPhBLcv +jO61BjEnwL6Q/EEuUYwWqOVnxEDeFlwK/zl843d2diUX7sN+yXauOZvNNnSNdaars2yjt 3CsVtHaiKvAqaa9dt0FGJKf2wGucm0fdFliPPg4Ryxkdq4E3hZLt7/9b4+CdzbOwJYv6Fe loWjmLRi4wy0SaQU0uyaUeid2IFGbOiTYZpeuhVMhCV3QHLQORPuSSp3352zfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753916255; a=rsa-sha256; cv=none; b=Gbir3yJJb9/9VhfHY+fhBUJlb4PWuidUbIr3Vub4c+RLQbtj2CVOPRrV5IrdWp0MVATCEm hSxiJBQrgsUNCFkf5fAJrDxMtzbN4ASZbMQBU3yZqSE1wZ+CVyiogjWO4EFIxJywrZGK/R zE6AE8JobPRk5D+5hQmZ9jwKSP/zs6t8ZxSPT9kocDv2cogRDPMEEjTMWHhYgYNIs7UN8T bdRA/e2xfL2H6RwTufFoRqijZJ1kQLGTFLNdIVg/e3iH3ZJ/+dcCCC1Mgs3iDuhL9BgGIF E2Uwzh2iBCFH3u27tqCS/p0ZgKttc8k8aHEElQUf8EmSsrSz2WqaFxDHmFxEeg== 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 4bsnfl3hl1zcxf; Wed, 30 Jul 2025 22:57:35 +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 56UMvZBG093766; Wed, 30 Jul 2025 22:57:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56UMvZZn093763; Wed, 30 Jul 2025 22:57:35 GMT (envelope-from git) Date: Wed, 30 Jul 2025 22:57:35 GMT Message-Id: <202507302257.56UMvZZn093763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 6fa24b29d8ff - main - release, bsdinstall: include FreeBSD-kernel-man package 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6fa24b29d8ff9af93cd249520b648cc745b1ef60 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6fa24b29d8ff9af93cd249520b648cc745b1ef60 commit 6fa24b29d8ff9af93cd249520b648cc745b1ef60 Author: Isaac Freund AuthorDate: 2025-07-25 11:31:59 +0000 Commit: Ed Maste CommitDate: 2025-07-30 22:57:17 +0000 release, bsdinstall: include FreeBSD-kernel-man package This package has been newly split off during man page reorganization and should be considered part of the "base" component rather than being ignored. Update pkgbase release and bsdinstall scripts for this change. Reviewed by: ivy Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51519 --- release/scripts/pkgbase-stage.lua | 4 +++- usr.sbin/bsdinstall/scripts/pkgbase.in | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/release/scripts/pkgbase-stage.lua b/release/scripts/pkgbase-stage.lua index 01eec8c44e49..1b48b4faede3 100755 --- a/release/scripts/pkgbase-stage.lua +++ b/release/scripts/pkgbase-stage.lua @@ -46,7 +46,9 @@ local function select_packages(pkg, media, all_libcompats) table.insert(components["src"], package) elseif package == "FreeBSD-tests" or package:match("^FreeBSD%-tests%-.*") then table.insert(components["tests"], package) - elseif package:match("^FreeBSD%-kernel%-.*") then + elseif package:match("^FreeBSD%-kernel%-.*") and + package ~= "FreeBSD-kernel-man" + then -- Kernels other than FreeBSD-kernel-generic are ignored if package == "FreeBSD-kernel-generic" then table.insert(components["kernel"], package) diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in index cf8e84de6923..d123394c170e 100755 --- a/usr.sbin/bsdinstall/scripts/pkgbase.in +++ b/usr.sbin/bsdinstall/scripts/pkgbase.in @@ -165,7 +165,9 @@ local function select_packages(pkg, options) table.insert(components["src"], package) elseif package == "FreeBSD-tests" or package:match("^FreeBSD%-tests%-.*") then table.insert(components["tests"], package) - elseif package:match("^FreeBSD%-kernel%-.*") then + elseif package:match("^FreeBSD%-kernel%-.*") and + package ~= "FreeBSD-kernel-man" + then -- Kernels other than FreeBSD-kernel-generic are ignored if package == "FreeBSD-kernel-generic" then table.insert(components["kernel"], package)