Page MenuHomeFreeBSD

add separate knob for zfs support in bootloader
ClosedPublic

Authored by mmacy on Jan 3 2019, 9:45 PM.

Details

Summary

Using the out of tree ZFS port requires us to disable ZFS for everything but the loader. This patch allows us to continue to build zfs support in the loader when building with MK_ZFS=no I'm going to the trouble of a review for a totally mechanical change because this kind of violates POLA by changing the existing behavior of MK_ZFS=no Would it make more sense to add MK_ZFSUSER and MK_ZFSKERNEL and change the sense of MK_ZFS=no to be MK_ZFSUSER=no + MK_ZFSKERNEL=no + MK_ZFSBOOT=no and ZoF users would build with MK_ZFSUSER=no and MAKE_ZFSKERNEL=no.

Diff Detail

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

Event Timeline

mmacy created this revision.Jan 3 2019, 9:45 PM
imp added inline comments.Jan 3 2019, 9:50 PM
share/mk/src.opts.mk
194 ↗(On Diff #52530)

LOADER_ZFS please. All the other options are named like that.

455 ↗(On Diff #52530)

MK_LOADER_ZFS:= no

stand/efi/boot1/Makefile
28 ↗(On Diff #52530)

MK_LOADER_ZFS

stand/efi/libefi/Makefile
47 ↗(On Diff #52530)

MK_LOADER_ZFS

stand/efi/loader/Makefile
29 ↗(On Diff #52530)

MK_LOADER_ZFS

stand/i386/Makefile
23 ↗(On Diff #52530)

MK_LOADER_ZFS

stand/i386/loader/Makefile
3 ↗(On Diff #52530)

MK_LOADER_ZFS

67 ↗(On Diff #52530)

MK_LOADER_ZFS

stand/libsa/Makefile
168 ↗(On Diff #52530)

MK_LOADER_ZFS

stand/sparc64/Makefile
8 ↗(On Diff #52530)

MK_LOADER_ZFS

stand/sparc64/loader/Makefile
3 ↗(On Diff #52530)

MK_LOADER_ZFS

24 ↗(On Diff #52530)

MK_LOADER_ZFS

45 ↗(On Diff #52530)

MK_LOADER_ZFS

stand/userboot/userboot/Makefile
48 ↗(On Diff #52530)

MK_LOADER_ZFS

mmacy updated this revision to Diff 52532.Jan 3 2019, 10:06 PM
  • MK_ZFSBOOT -> MK_LOADER_ZFS

Please also add descriptions in tools/build/options

mmacy updated this revision to Diff 52534.Jan 3 2019, 10:55 PM
  • update build knob docs
rgrimes accepted this revision as: rgrimes.Jan 4 2019, 6:08 AM
rgrimes added a reviewer: bhyve.
This revision is now accepted and ready to land.Jan 4 2019, 6:09 AM
This revision was automatically updated to reflect the committed changes.