The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=6fa24b29d8ff9af93cd249520b648cc745b1ef60
commit 6fa24b29d8ff9af93cd249520b648cc745b1ef60
Author: Isaac Freund <ifre...@freebsdfoundation.org>
AuthorDate: 2025-07-25 11:31:59 +0000
Commit: Ed Maste <ema...@freebsd.org>
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)
