Page MenuHomeFreeBSD

fstyp(8): define HAVE_ZFS macro when built with zfs
ClosedPublic

Authored by rew on May 12 2021, 3:17 AM.

Details

Summary

The HAVE_ZFS macro was dropped from the Makefile during the OpenZFS
merge, bring it back.

PR: 255616
Reported by: Michael Büker <freebsd@michael-bueker.de>
Submitted by: Michael Büker <freebsd@michael-bueker.de>
Fixes: 9e5787d2284e187abb5b654d924394a65772e004

Diff Detail

Repository
rG 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

rew requested review of this revision.May 12 2021, 3:17 AM
rew retitled this revision from fstype(8): define HAVE_ZFS macro when built with zfs to fstyp(8): define HAVE_ZFS macro when built with zfs.May 12 2021, 3:20 AM
This revision was not accepted when it landed; it landed in state Needs Review.May 13 2021, 1:34 AM
This revision was automatically updated to reflect the committed changes.
rew removed rG FreeBSD src repository as the repository for this revision.
rew removed subscribers: rgrimes, bcran.

previous diff was an error, this is the correct diff.

markj added a subscriber: markj.
markj added inline comments.
usr.sbin/fstyp/Makefile
31

BTW, this line doesn't appear to be needed at least on amd64.

This revision is now accepted and ready to land.May 13 2021, 12:37 PM
usr.sbin/fstyp/Makefile
31

Since you point it out, I notice that it appears to be unused. WARNS is already set to 2 farther up (line 15).

I'll remove this line on commit if there's no objection.

usr.sbin/fstyp/Makefile
31

Works for me, thanks.