]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
MFC r336084-r336085, r336118: Move zfs impl into libsa
authorkevans <kevans@FreeBSD.org>
Wed, 20 Feb 2019 19:13:09 +0000 (19:13 +0000)
committerkevans <kevans@FreeBSD.org>
Wed, 20 Feb 2019 19:13:09 +0000 (19:13 +0000)
commit1fc41abb2fa6dba03aea53f70f98000435814f72
tree8294db8fe53c418fef3c6c18b341a034fbb6e831
parentdeec0760ffe3a527681aee7d6af987c5fae3df3d
MFC r336084-r336085, r336118: Move zfs impl into libsa

r336084:
Move ZFS files into libsa

Move the libzfs stuff into libsa. There's no need for it to be a
separate library. The separate library adds to the issues of build
ordering that we see from time to time. Move the filesystem support
into libsa, like all the other filesystem support rather than making
zfs the odd-duck out.

Discussed with: allanjude@

r336085:
Stop using ../zfs/libzfs.h but instead use libzfs.h.

While ../zfs/libzfs.h mostly works, there are a few situations where
it does not. Eliminate the problem by using plain libzfs.h, like we do
for ufs support. This fixes the weird cases, and is easier to
understand. It also follows the general style convetion of avoiding
../ in #includes.

r336118:
Remove dirs that git svn should have removed but didn't.
32 files changed:
stand/Makefile
stand/common/zfs_cmd.c
stand/defs.mk
stand/efi/boot1/Makefile
stand/efi/loader/Makefile
stand/i386/gptzfsboot/Makefile
stand/i386/libi386/Makefile
stand/i386/libi386/devicename.c
stand/i386/loader/Makefile
stand/i386/loader/conf.c
stand/i386/loader/main.c
stand/i386/zfsboot/Makefile
stand/i386/zfsloader/Makefile
stand/libsa/Makefile
stand/libsa/zfs/Makefile.inc [moved from stand/zfs/Makefile with 74% similarity]
stand/libsa/zfs/devicename_stubs.c [moved from stand/zfs/devicename_stubs.c with 100% similarity]
stand/libsa/zfs/libzfs.h [moved from stand/zfs/libzfs.h with 100% similarity]
stand/libsa/zfs/zfs.c [moved from stand/zfs/zfs.c with 100% similarity]
stand/libsa/zfs/zfsimpl.c [moved from stand/zfs/zfsimpl.c with 100% similarity]
stand/loader.mk
stand/ofw/libofw/Makefile
stand/ofw/libofw/devicename.c
stand/pc98/libpc98/Makefile
stand/sparc64/loader/Makefile
stand/sparc64/loader/main.c
stand/sparc64/zfsloader/Makefile
stand/userboot/userboot/Makefile
stand/userboot/userboot/conf.c
stand/userboot/userboot/devicename.c
stand/userboot/userboot/main.c
stand/zfs/Makefile.depend [deleted file]
stand/zfs32/Makefile [deleted file]