From nobody Mon Sep 22 22:39:57 2025 X-Original-To: freebsd-current@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 4cVyjf2l5zz68Xjc for ; Mon, 22 Sep 2025 22:40:06 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-io1-xd35.google.com (mail-io1-xd35.google.com [IPv6:2607:f8b0:4864:20::d35]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cVyjd25JHz3bTn for ; Mon, 22 Sep 2025 22:40:05 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=hardenedbsd.org header.s=google header.b=FSYwaHTa; dmarc=pass (policy=none) header.from=hardenedbsd.org; spf=pass (mx1.freebsd.org: domain of shawn.webb@hardenedbsd.org designates 2607:f8b0:4864:20::d35 as permitted sender) smtp.mailfrom=shawn.webb@hardenedbsd.org Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-8935b53bb14so135636339f.0 for ; Mon, 22 Sep 2025 15:40:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1758580799; x=1759185599; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Rzk7wfUpeMuTAUPR/PJGOPTI6PdKkPkl62zXJvZ+P0k=; b=FSYwaHTaLQd2VvkFrkQPUKvM1lMVnTRG2irgrcRu400pEJ0MGdreS+x3e97Y17PpGb qAjfLjiVjWuJqoDaKSoZeseWdhK5ZruCB0jLu9lcVukY4x8q0v66uqBuQDxeYosVcSQ/ H3fhfmygRi5oR/rrg6CVK87cMcqTzUtxe7yJy10D1o2hkrXIBuwS5m3MVT00jNJbX5n8 vvvDvjy4tBanRvLG/cUmJkZ8IthEFLRexJ5j/wZXHm8VrsdL9ajmnA3oiNDZwZR9lDpU yBV8eYu2gQ1Fc5vk+r3p3oa1nblK6RISyXWlUQhmx42xqC8Am7KYuKcgRlmA9FBbpZ3z O2lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758580799; x=1759185599; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Rzk7wfUpeMuTAUPR/PJGOPTI6PdKkPkl62zXJvZ+P0k=; b=pThutMB+avULbjsi91VpClfWOvh+IG+nBvBjvgTPO6S8bbY/aFffeTq+kWPiPYBfBc On7sOqcck0/fcluiNlU43uyEsbRolICAtdE6gw163UpjODbJ9/GdGIZUXCOHFu/M+EZ/ UvU7f6ZpYajazY2ayVN1lkGjpML/5KdZyMqsL5fgMkOT+kD3qkmNr3I/ttxk1sb2f5jx 5CieSZLk4W/Rv7bS3uYtcVThnvrxjU+lzON6aTNNq2C3tfbzhbe2dUBibqLvHvWt88du gYRNMw0eLgqXwFeTyFdszGvU86VoHINbO1oKByy/eRejfMwPLNkKAV4aULEr5ViVkER/ PrWA== X-Gm-Message-State: AOJu0YyKsbQh8U6PJVJqaGMFvwwdVBGIpdgR4elk1UWxxs+95wka88+0 y9Ue9bKS4cCLM7RrB3k9Bi5lSPP5hYX0xPDzSLOmxCtQPLtQ47u6Zajd8IaemJMlKBobBjomol9 Zwn1ZTmrnao5+geSbj0xiFtSSQaON9O+XF+8ficRhr3COza687W121lBRKbv1idcvlElYU9Jq0N Kj7cjlkGsHQ7Hoz/q/+Rs7dyIrFcSFjcgEz0dVjZf23vTReU5+xg+NDxv4yCI= X-Gm-Gg: ASbGncuXKj/zK0GBCLF6KZKOjqF0+AKQadOWKK2R+Z2Umcr3F0EBoehjLeC7xzLPnhU 1yhJTwjNYtYIJokn/9Xjwpv2oVnQu2UcWushxlwXJroH4Q4GnWFEmtFAqBVfKLhX3tiRhy8trlu 9iQuLbhet1EAIc8uZ80KjsHebKNrWDkzMTWbiktK2jIOZJ4EsDy6arG6TxCKz3k3+nzvWIxRDzC 6kBCOlsQvJuCrPCPLzH1G9KBrHOB0KZEqcxztUrD4UAjZL6JG0RENoMy9ciQZOE6oQhF97IoNtB Bzvs8vwlAJp4oiNhpnxm7hld7Kwi0cjl4T2EF67mlCeWVxAIuUHfSaSDH9G3BUhL9dsNbe3VNLW cVH11gmXeO0Phfqw= X-Google-Smtp-Source: AGHT+IFDNS8wHntQ+YL1CKyTcFdNBkkMrhhlsl2iz6zVl1cSYO2qOX6Oo/Dy+2fGnNkonTe0Rii/RQ== X-Received: by 2002:a05:6602:3e87:b0:887:56b5:b502 with SMTP id ca18e2360f4ac-8e1fc8a4d67mr118497039f.10.1758580799063; Mon, 22 Sep 2025 15:39:59 -0700 (PDT) Received: from mutt-hbsd ([2001:470:4001:1::95]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-8a47d920713sm489363739f.16.2025.09.22.15.39.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Sep 2025 15:39:58 -0700 (PDT) Date: Mon, 22 Sep 2025 22:39:57 +0000 From: Shawn Webb To: "freebsd-current@freebsd.org" Subject: Re: Plan for "distribution set" deprecation Message-ID: X-Operating-System: FreeBSD mutt-hbsd 14.3-STABLE-HBSD FreeBSD 14.3-STABLE-HBSD HARDENEDBSD-14-STABLE amd64 X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <3ily2wedv7oue6qjjv2b47c37umnlqw363whvpohu6rrpz3hsg@a6g6mgjuy334> List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="gc5hxa62opw2kqko" Content-Disposition: inline In-Reply-To: X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.59 / 15.00]; SIGNED_PGP(-2.00)[]; HAS_FILE_URL(2.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.993]; DMARC_POLICY_ALLOW(-0.50)[hardenedbsd.org,none]; MID_RHS_NOT_FQDN(0.50)[]; R_DKIM_ALLOW(-0.20)[hardenedbsd.org:s=google]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; ARC_NA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; MISSING_XM_UA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_EQ_ADDR_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[freebsd-current@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::d35:from]; DKIM_TRACE(0.00)[hardenedbsd.org:+] X-Rspamd-Queue-Id: 4cVyjd25JHz3bTn --gc5hxa62opw2kqko Content-Type: text/plain; protected-headers=v1; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: Plan for "distribution set" deprecation MIME-Version: 1.0 On Mon, Sep 22, 2025 at 11:23:55PM +0100, Lexi Winter wrote: > Shawn Webb wrote in <3ily2wedv7oue6qjjv2b47c37umnlqw363whvpohu6rrpz3hsg@a= 6g6mgjuy334>: > > > > I have confirmed that the pkgbase repo that gets built does indeed > > > > include the right kernel package. Hence why I'm puzzled why that lua > > > > assertion is being tripped. > > >=20 > > > please also show the (names of) the kernel packages you have in your > > > release repository, i.e. the one in /release/pkgbase-repo > > > which is generated during the release build. > >=20 > > =3D=3D=3D=3D BEGIN OUTPUT =3D=3D=3D=3D > > $ pkg repos > > LocalBase: {=20 > > url : "file:///usr/obj/usr/src/amd64.amd64/release/pkgb= ase-repo/FreeBSD:16:amd64/latest", > > enabled : yes, > > priority : 0 > > } > > $ pkg rquery -U -r LocalBase '%n' | grep HardenedBSD-kernel-hardenedbsd > > HardenedBSD-kernel-hardenedbsd > > HardenedBSD-kernel-hardenedbsd-dbg > > =3D=3D=3D=3D END OUTPUT =3D=3D=3D=3D > >=20 > > That `pkg rquery` command is effectively the same as what that lua > > script is executing, which is why I'm extra confused. >=20 > pkgbase-stage.lua expects the kernel package to be called "kernel-generic= ", > but yours is called "kernel-hardenedbsd", which would cause this error. > did you patch the script to change this? (if so, you'll also need to pat= ch > bsdinstall the same way otherwise the install will fail at runtime.) That was why I included the modified code as part of the email I had sent. All references to FreeBSD-branded stuff (including renaming the kernel from GENERIC/generic to HARDENEDBSD/hardenedbsd) have been changed accordingly. I just now uploaded the diff to the hardened/current/master branch: https://hardenedbsd.org/~shawn/2025-09-22_pkgbase-r01.patch.txt Note that some of the bsdinstall bits might indeed still need to be modified. But that's the next problem to tackle. >=20 > if you've modified pkgbase-stage.lua, a link to the version you're using > would be handy. That link above should include the full diff. Please let me know if you feel I've missed something. Note that to apply that diff, you'll need an up-to-date HardenedBSD src tree (branch: hardened/current/master). Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --gc5hxa62opw2kqko Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmjR0DYACgkQ/y5nonf4 4fohbg/9Edct1z419FU/boKX1g1RCyUGdgNEDWu9/6jrQ77Dig5d3z9Er3EJ36bB zBug4hk7+Cnq3I6nBQQjuXDfMSbmSjD90quelPP1rPuGRAm9PB67d2buikEED1Y6 ZoLDHfHL8FrW8H9H+K+NYG+lPptmvt0zEyZU2VV5ESqj7AxADXlc3q6TBUuAUX52 qkgXcMActkHHlmxAgUmp9O/tnolmxLlX36kuEri3gjDvEAUB1LgxYdm4y0cUowZo LUYEd76b/BxrwnOwkBaEXSAmanP+xnyNqder1sBovorUh0xkYs6B7VJFQitxXuEU rUPlvzqXT6bu8si7umLQuC3k8AK6X79a5S5UEboynZdjbXwjO3t+z5zXub0kcwTH bvYzgH7LsG26YlqUzh4bBX1UHOtd0ZxaDC/D5/ZsnOODIsW3hTz4pU6mfO6pyMgK 2ZYW2x547fDcN5X0sx9Ue0R1MfJXpSueRU04RWoz/LxlNLGybqY2KQpvM+sW1uL5 NCfMHZGKxAS/bLi9Oh1o6J485xrw8ylya3RqTbEkSkczHeXllbjbWCFJGc6oHGVR LJdM4EQiLjIKrQSB6lg19pzuny3EN20bAXcurc196I/Enb6xnXzqDl9IuJfHLycE fxLMgn+h3HQfukMxLkk7PFvLZG9wA4Y40D0+3cNw+CXkbOW2k/8= =e2OC -----END PGP SIGNATURE----- --gc5hxa62opw2kqko--