Module Name: src
Committed By: hannken
Date: Sat Jun 22 09:48:40 UTC 2019
Modified Files:
src/external/cddl/osnet: Makefile.zfs
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: zfs_context.h
src/usr.sbin/fstyp: Makefile
Added Files:
src/external/cddl/osnet/dist/lib/libzpool/common/sys: zfs_context.h
Removed Files:
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
Sync with upstream r315983.
FreeBSD splits "zfs_context.h" into:
"lib/libzpool/common/sys/zfs_context.h" for user space
"uts/common/fs/zfs/sys/zfs_context.h" for kernel space
Do the same here, move and sync "sys/sys/zfs_context.h" to
"dist/lib/libzpool/common/sys/zfs_context.h" and
"dist/uts/common/fs/zfs/sys/zfs_context.h".
Change "Makefile.zfs" to search includes from "dist/lib"
before "dist/uts" so we get the right include file.
Adapt "usr.sbin/fstyp/Makefile" to get the right include file.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/Makefile.zfs
cvs rdiff -u -r0 -r1.1 \
src/external/cddl/osnet/dist/lib/libzpool/common/sys/zfs_context.h
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_context.h
cvs rdiff -u -r1.22 -r0 src/external/cddl/osnet/sys/sys/zfs_context.h
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/fstyp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
