From nobody Thu Oct 2 01:37:56 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 4ccZDj2N1xz69ryt; Thu, 02 Oct 2025 01:37:57 +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 4ccZDj0QnPz3d90; Thu, 02 Oct 2025 01:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759369077; 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=2/xkm0x0zDkSqjnENnvqDXX+JHHDew//wP60DntJXGg=; b=xFMsoy/LErsrlgXdSjhw8LD/5VvOu2gbazQlcXUiqVewl486F5NRgaQo3D5ce41jYXTC59 Cv1/0YWig0IN6McOgJucYIm1FNd2nqBi3M0hDUrxd5GG3UTYJ79dNNrM0otD9r+MtPspGs inCFO7pm0Kody9/rUYsWczgiZvVBjOIq8ZhSAIG6VfjcP8ZIU91Q7+oF01aSZwoUl8Iluq tk9JvD0yV+agEw2r5a3vD5gZ1o0dwrgKUhijJFC8ZLiJPaR2DMe4p8dy2QjfigisHkv0Kk 3stYp/YakjLo8tdxA5TLnsxt32OljV2gTw+0vC/xYsv0fCBd0+DpBw6mrYxQ3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759369077; 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=2/xkm0x0zDkSqjnENnvqDXX+JHHDew//wP60DntJXGg=; b=HzwA1AzQ0CE5yJsKMLpXtt257/bmcTcjeieSiMTMQkYbH/FA1lpGbpwESSMbfPl6xgSBwg ODhDcrYjzWisQ2dwhn0eojuMr/ART1KHD+s+S9DKUfnCxmLRYluHFdfW/33fFZx2YXJS+U fp58qqcWy4oP/iB8ufnsTKGKZXTJUDgJuqRjDZ7copc5x84W5j44xWX3nEMzqMvgkCYYI5 nPMhwYguxoEZASLXk3qgc+DKSTnuvCMlZcVzSn8kqIxZDU2N2+pSwXd6Qg/KNh5QqoL4se o3Ec9RQNtrd0rE5O4SGopBil9NJ+8jLgz2HtlWSE0sOJS2+iTqI6JHc9D6DtQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759369077; a=rsa-sha256; cv=none; b=IU644l17PQKUg0gr01YEiHC0P7OxMXqYsdSPx3cdLCLOvog9k0q3Sl8/uEiIxLNpY7N9ib lA+cWvSbBPbHaCOT7zGAfxs+/UUMRtco9+IQLj98DgDilzgDomi8CP78l/V8aRVpgBorIm NBgig0mO1zLlLc60fyXuqWaOiLxvPpmYkZGui4oJ9P+6gqdbLuIvfADtu0qIOu4XEaC+zb ZpyhNGWQSRp7m6RmbWqWUvA/eVEPJMz1V7aRUwIinYZjsgc/OWePf4HCd/FDwHzHQP0SRQ zceJhiwbHSvLGILIVTb+gYTnxxsg/i1Rnc4Gy9i4diAHAjTGd3Mm4dtcu+ECUg== 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 4ccZDh6KDYznWr; Thu, 02 Oct 2025 01:37:56 +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 5921buGh035681; Thu, 2 Oct 2025 01:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5921buv8035678; Thu, 2 Oct 2025 01:37:56 GMT (envelope-from git) Date: Thu, 2 Oct 2025 01:37:56 GMT Message-Id: <202510020137.5921buv8035678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: ed6716207deb - main - bsdinstall/pkgbase: Restore the kernel-dbg component 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed6716207debca81c37a1399ecf1d799be0e688d Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ed6716207debca81c37a1399ecf1d799be0e688d commit ed6716207debca81c37a1399ecf1d799be0e688d Author: Lexi Winter AuthorDate: 2025-10-02 01:13:56 +0000 Commit: Lexi Winter 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)