Makefile.inc1: Make NO_INSTALLKERNEL less of a hack
ClosedPublic
Actions

Authored by jrtc27 on Dec 18 2025, 5:55 PM.

Details

Reviewers

ivy
emaste
imp
kevans
sjg

Commits

rG2c0e9a76c1ce: Makefile.inc1: Make NO_INSTALLKERNEL less of a hack

Summary

Rather than adding a dummy entry which requires everyone to know to skip
it, introduce a new INSTALLEXTRAKERNELS which contains the set of
kernels to install as kernel.KERNCONF.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jrtc27 requested review of this revision.Dec 18 2025, 5:55 PM

jrtc27 created this revision.

Harbormaster completed remote builds in B69376: Diff 168332.Dec 18 2025, 5:55 PM

jrtc27 mentioned this in D54282: packages: Always install kernel as /boot/kernel.NAME.Dec 18 2025, 5:55 PM

Can we put this in build(7)?

Move INSTALLEXTRAKERNELS after NO_INSTALLEXTRAKERNELS is set. Hidden by testing originally on CheriBSD where we set NO_INSTALLEXTRAKERNELS to no early for Morello..

Harbormaster completed remote builds in B69377: Diff 168333.Dec 18 2025, 6:01 PM

sjg added inline comments.Dec 18 2025, 9:29 PM

Makefile.inc1
1868	why skip the 1st entry? In the original version ${BUILDKERNELS:Ndummy} might have been simpler, but you're getting rid of dummy

jrtc27 added inline comments.Dec 18 2025, 9:31 PM

Makefile.inc1
1868	This is the !NO_INSTALLKERNEL case where there wasn't a dummy entry before, and still isn't. The first entry is being installed separately to /boot/kernel. The dummy entry was to work around the fact that it always skipped the first entry even with NO_INSTALLKERNEL, and now that doesn't happen.