Re: Plan for "distribution set" deprecation

On Mon, Sep 22, 2025 at 11:23:55PM +0100, Lexi Winter wrote:
> Shawn Webb wrote in <3ily2wedv7oue6qjjv2b47c37umnlqw363whvpohu6rrpz3hsg@a6g6mgjuy334>:
> > > > 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.
> > > 
> > > please also show the (names of) the kernel packages you have in your
> > > release repository, i.e. the one in <objdir>/release/pkgbase-repo
> > > which is generated during the release build.
> > 
> > ==== BEGIN OUTPUT ====
> > $ pkg repos
> > LocalBase: { 
> >     url             : "file:///usr/obj/usr/src/amd64.amd64/release/pkgbase-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
> > ==== END OUTPUT ====
> > 
> > That `pkg rquery` command is effectively the same as what that lua
> > script is executing, which is why I'm extra confused.
> 
> 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 patch
> 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.

> 
> 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,

-- 
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/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc