Page MenuHomeFreeBSD
Differential D54291

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

Authored by jrtc27 on Thu, Dec 18, 5:55 PM.
Tags
None
Referenced Files
F140015895: D54291.id.diff
Fri, Dec 19, 1:56 AM
F140007149: D54291.id168333.diff
Thu, Dec 18, 10:57 PM
F140003338: D54291.id168332.diff
Thu, Dec 18, 9:40 PM
F139997310: D54291.diff
Thu, Dec 18, 7:39 PM
Subscribers
ziaee

Details

Reviewers
ivy
emaste
imp
kevans
sjg
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 Passed
Unit
No Test Coverage
Build Status
Buildable 69377
Build 66260: arc lint + arc unit

Event Timeline

jrtc27 requested review of this revision.Thu, Dec 18, 5:55 PM
jrtc27 created this revision.
Harbormaster completed remote builds in B69376: Diff 168332.Thu, Dec 18, 5:55 PM
jrtc27 mentioned this in D54282: packages: Always install kernel as /boot/kernel.NAME.Thu, Dec 18, 5:55 PM
ziaee added a subscriber: ziaee.Thu, Dec 18, 6:01 PM

Can we put this in build(7)?

jrtc27 updated this revision to Diff 168333.Thu, Dec 18, 6:01 PM

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.Thu, Dec 18, 6:01 PM
sjg added inline comments.Thu, Dec 18, 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.Thu, Dec 18, 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.

ivy accepted this revision.Thu, Dec 18, 11:17 PM

i've tested D54282 rebased on this diff and it seems to work fine.

In D54291#1240688, @ziaee wrote:

Can we put this in build(7)?

there are no user-visible changes in this patch. you could document NO_INSTALLKERNEL if you want.

This revision is now accepted and ready to land.Thu, Dec 18, 11:17 PM
sjg added inline comments.Fri, Dec 19, 12:56 AM
Makefile.inc1
1868

Ok, I suspected as much, but perhaps a comment wouldn't hurt

Revision Contents
Changeset List

PathSize
32 lines

Diff 168333

View Options

Makefile.inc1

Loading...