From nobody Fri Oct 3 20:15:36 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 4cdfzr6lZPz696hT; Fri, 03 Oct 2025 20:15:36 +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 4cdfzr5F7Nz3tmt; Fri, 03 Oct 2025 20:15:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759522536; 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=cK7fCTPDxIZF+rhoCLueZoeqgHgM1LOO353R4i5f4GY=; b=vk2LrkdfiaGf1AAIwS/t7kg2Q1q0HIoimzcP6CuRBej52h+BVy4xWC+ajhB47cHBFcMi5f Erc5SpmlLXj4Ns93kcHTyCNHVz24VIOMQl8ZiITC+clYauwnLnLtSc1g+c61hCJjTCfWyb Tm7ZXwfHmLic/7VO4MLwbCOtoXWdQh7GT85/1gHpSjzKoi8qSgXhRoFdR3SI0tqN8oQFEy /66jFuSDFl4ViTWLyYeGhuQUJ5djbWLqPsyqp4n/iDpsM0plV3JBDIIwMTzWg+u2r8+0MD g4yuD/9SJunmLIcARAqeEstl9TKV77aiQKzDSEZUUcvM/79mXkoQ+E/Iz7dWNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759522536; 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=cK7fCTPDxIZF+rhoCLueZoeqgHgM1LOO353R4i5f4GY=; b=d/OTRjesvMU1fpScO3U6LktEgixCBdTIIg/pxiFz+iIWeD4mayCIp9OzyFjfBohxNbvIK2 ND+ijd1+bLbrkiMn0M3hhto9crJdMFihFgTzouHWV0jjUyo1re8/IBjMpHUKZisBGODGLF ULvXyFkAswXWlf7thHWDxkyhYW/IrzE07VPobvzcXpGsHzYFtR/8RaP3O3TNvrm2ys6Ow8 Ow/tWR8Qpy5BoBzBoFFm/xdDJ5hrEQFd+7/TRBz60TM44M4T0HgdebH+jC8CuAx+xwhhDk L16VTK0Qve7r4l3p0sP/b8/m5LW8NJT1f3d+MU35lF2v0nKsG4WZBZUIAQHq8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759522536; a=rsa-sha256; cv=none; b=CRT1Db6RMfbpCeThL9T6hcouuw0PRNAGn7QaixxgwwDs6M6BsjwIxeeqfTjBaY1KmYL+hg 1gCY7OvbSIeT37PA3oqWiL1juARg1uYvUHYBhzyENjySOh4gSzM0oz9SdKnClV2nhCkG4X w+9AJuF7Qy28A+ph2C7azEPOXUC7THskYG13us3haYnPa/W8vpvufTOUqsyHg4NI+AW3VV qpQdDPTKrKO/a+qLMEFkApxZeK1yDkq+8U1JGpArNNe2vSaRrDCrPOfPcQNVTX4ofbCsKn 0bEVMeqK24THjMz7zscSFwMsZTi0k90Ym32OYgKELSnyWFc1ibnbAW7BkHb3hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cdfzr4qyfz18Lw; Fri, 03 Oct 2025 20:15:36 +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 593KFaEU042819; Fri, 3 Oct 2025 20:15:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 593KFa6f042816; Fri, 3 Oct 2025 20:15:36 GMT (envelope-from git) Date: Fri, 3 Oct 2025 20:15:36 GMT Message-Id: <202510032015.593KFa6f042816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 15d367160d00 - stable/15 - bsdinstall/pkgbase: Restore the kernel-dbg component 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 15d367160d000daaeef1503c6ef770a773902145 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=15d367160d000daaeef1503c6ef770a773902145 commit 15d367160d000daaeef1503c6ef770a773902145 Author: Lexi Winter AuthorDate: 2025-10-02 01:13:56 +0000 Commit: Lexi Winter CommitDate: 2025-10-03 19:21:59 +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 (cherry picked from commit ed6716207debca81c37a1399ecf1d799be0e688d) --- 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)