Page MenuHomeFreeBSD

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

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

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

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 ↗(On Diff #63642)

Does this need to be wrapped in .if empty(KERNBUILDDIR)?

share/mk/bsd.kmod.mk
3 ↗(On Diff #63642)

Same.

sys/conf/kmod.mk
82 ↗(On Diff #63642)

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.

share/mk/bsd.dtb.mk
3 ↗(On Diff #63642)

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#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.

When we define KERNBUILDDIR, we also define SYSDIR, so checking it is redundant.

This revision is now accepted and ready to land.Nov 14 2019, 12:40 AM

Running a final make universe before committing.
Should be in tomorrow morning if nothing breaks.