Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Oct 2025 01:37:56 GMT
From:      Lexi Winter <ivy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: ed6716207deb - main - bsdinstall/pkgbase: Restore the kernel-dbg component
Message-ID:  <202510020137.5921buv8035678@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by ivy:

URL: https://cgit.FreeBSD.org/src/commit/?id=ed6716207debca81c37a1399ecf1d799be0e688d

commit ed6716207debca81c37a1399ecf1d799be0e688d
Author:     Lexi Winter <ivy@FreeBSD.org>
AuthorDate: 2025-10-02 01:13:56 +0000
Commit:     Lexi Winter <ivy@FreeBSD.org>
CommitDate: 2025-10-02 01:37:35 +0000

    bsdinstall/pkgbase: Restore the kernel-dbg component
    
    Commit 561dc357c2f5 changed the way we handle components in the prompt,
    and accidentally resulted in the kernel-dbg component not being listed
    since we now hide all components ending in "-dbg".
    
    Add an exception for kernel-dbg to bring it back.
    
    Fixes:  561dc357c2f5 ("bsdinstall: Use package sets for pkgbase install")
    MFC after:      3 seconds
    Reviewed by:    emaste
    Sponsored by:   https://www.patreon.com/bsdivy
    Differential Revision:  https://reviews.freebsd.org/D52826
---
 usr.sbin/bsdinstall/scripts/pkgbase.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr.sbin/bsdinstall/scripts/pkgbase.in b/usr.sbin/bsdinstall/scripts/pkgbase.in
index d02d89b23865..14ef67723d59 100755
--- a/usr.sbin/bsdinstall/scripts/pkgbase.in
+++ b/usr.sbin/bsdinstall/scripts/pkgbase.in
@@ -117,7 +117,7 @@ local function select_components(components, options)
 		-- are only offered if no_kernel is set.
 		if component ~= "pkg" and
 		   not component:match("^minimal") and
-		   not component:match("%-dbg$") and
+		   not (component:match("%-dbg$") and component ~= "kernel-dbg") and
 		   not (component == "kernels") and
 		   not (not options.no_kernel and component:match("%-jail$")) then
 			table.insert(sorted_components, component)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510020137.5921buv8035678>