Introduce bsd.sysdir.mk to consolidate looking for the kernel.
ClosedPublic
Actions

Authored by imp on Oct 24 2019, 6:15 PM.

Details

Reviewers

jhb

Commits

rS354968: Introduce bsd.sysdir.mk to consolidate looking for the kernel.

Diff Detail

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 27205
Build 25471: arc lint + arc unit

Event Timeline

imp created this revision.Oct 24 2019, 6:15 PM

Herald added subscribers: emaste, bdrewery. · View Herald TranscriptOct 24 2019, 6:15 PM

Harbormaster completed remote builds in B27205: Diff 63642.Oct 24 2019, 6:15 PM

imp mentioned this in D22118: Add a kmod.opts.mk..Oct 24 2019, 6:17 PM

I guess the extra directories don't hurt. I'm less certain about the implications of the missing checks for an empty KERNBUILDDIR.

share/mk/bsd.dtb.mk
3	Does this need to be wrapped in `.if empty(KERNBUILDDIR)`?
share/mk/bsd.kmod.mk
3	Same.
sys/conf/kmod.mk
82	Same?

In D22144#484006, @jhb wrote:

I guess the extra directories don't hurt. I'm less certain about the implications of the missing checks for an empty KERNBUILDDIR.

Same concerns but I like the change otherwise.

Ping. The kmod.opts.mk change is a prerequisite for bhyve save/restore, so I'd like to either commit that one as-is and do this cleanup afterwards, or get this one unstuck to make forward progress. I still have questions about the KERNBUILDDIR stuff as I don't fully understand the implications of removing those checks.

imp added inline comments.Nov 7 2019, 5:11 PM

share/mk/bsd.dtb.mk
3	No. I don't think so. KERNBUILDDIR I think is actually irrelevant. If SYSDIR being defined or not is all that matters here. When we define it, we also define SYSDIR, so the !defined() is sufficient.

In D22144#484174, @bdrewery wrote:

In D22144#484006, @jhb wrote:

I guess the extra directories don't hurt. I'm less certain about the implications of the missing checks for an empty KERNBUILDDIR.

Same concerns but I like the change otherwise.