diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index b5e3b458f982..6a39e342bafc 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -1,16 +1,16 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl -PACKAGE= runtime +PACKAGE= zfs LIB= avl LIBADD= spl SRCS= avl.c WARNS?= 3 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h .include diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 58ebb292c946..4fc17916d1df 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -1,119 +1,119 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp -PACKAGE= utilities +PACKAGE= zfs LIB= icp LIBADD= .if ${MACHINE_ARCH} == "amd64" ASM_SOURCES_C = asm-x86_64/aes/aeskey.c ASM_SOURCES_AS = \ asm-x86_64/aes/aes_amd64.S \ asm-x86_64/aes/aes_aesni.S \ asm-x86_64/modes/gcm_pclmulqdq.S \ asm-x86_64/modes/aesni-gcm-x86_64.S \ asm-x86_64/modes/ghash-x86_64.S \ asm-x86_64/sha2/sha256_impl.S \ asm-x86_64/sha2/sha512_impl.S \ asm-x86_64/blake3/blake3_avx2.S \ asm-x86_64/blake3/blake3_avx512.S \ asm-x86_64/blake3/blake3_sse2.S \ asm-x86_64/blake3/blake3_sse41.S CFLAGS+= -D__amd64 -D_SYS_STACK_H -UHAVE_AES .elif ${MACHINE_ARCH} == "aarch64" ASM_SOURCES_C = ASM_SOURCES_AS = \ asm-aarch64/blake3/b3_aarch64_sse2.S \ asm-aarch64/blake3/b3_aarch64_sse41.S .elif ${MACHINE_ARCH} == "powerpc64le" ASM_SOURCES_C = ASM_SOURCES_AS = \ asm-ppc64/blake3/b3_ppc64le_sse2.S \ asm-ppc64/blake3/b3_ppc64le_sse41.S .else ASM_SOURCES_C = ASM_SOURCES_AS = .endif KERNEL_C = \ spi/kcf_spi.c \ api/kcf_ctxops.c \ api/kcf_cipher.c \ api/kcf_mac.c \ algs/aes/aes_impl_aesni.c \ algs/aes/aes_impl_generic.c \ algs/aes/aes_impl_x86-64.c \ algs/aes/aes_impl.c \ algs/aes/aes_modes.c \ algs/blake3/blake3.c \ algs/blake3/blake3_generic.c \ algs/blake3/blake3_impl.c \ algs/blake3/blake3_x86-64.c \ algs/edonr/edonr.c \ algs/modes/modes.c \ algs/modes/cbc.c \ algs/modes/gcm_generic.c \ algs/modes/gcm_pclmulqdq.c \ algs/modes/gcm.c \ algs/modes/ctr.c \ algs/modes/ccm.c \ algs/modes/ecb.c \ algs/sha2/sha2.c \ algs/skein/skein.c \ algs/skein/skein_block.c \ algs/skein/skein_iv.c \ illumos-crypto.c \ io/aes.c \ io/sha2_mod.c \ io/skein_mod.c \ core/kcf_sched.c \ core/kcf_prov_lib.c \ core/kcf_callprov.c \ core/kcf_mech_tabs.c \ core/kcf_prov_tabs.c \ $(ASM_SOURCES_C) SRCS= $(ASM_SOURCES_AS) $(KERNEL_C) WARNS?= 2 SHLIB_MAJOR= 3 CSTD= c99 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h CFLAGS.aes_amd64.S+= -DLOCORE CFLAGS.aes_aesni.S+= -DLOCORE CFLAGS.gcm_pclmulqdq.S+= -DLOCORE CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE CFLAGS.ghash-x86_64.S+= -DLOCORE CFLAGS.sha256_impl.S+= -DLOCORE CFLAGS.sha512_impl.S+= -DLOCORE CFLAGS.blake3_avx2.S = -DLOCORE CFLAGS.blake3_avx512.S = -DLOCORE CFLAGS.blake3_sse2.S = -DLOCORE CFLAGS.blake3_sse41.S = -DLOCORE CFLAGS.b3_aarch64_sse2.S = -DLOCORE CFLAGS.b3_aarch64_sse41.S = -DLOCORE CFLAGS.b3_ppc64le_sse2.S = -DLOCORE CFLAGS.b3_ppc64le_sse41.S = -DLOCORE .include diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index d436b9b1df27..8a7dd0093cf1 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -1,33 +1,33 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair .PATH: ${SRCTOP}/sys/contrib/openzfs/include LIB= nvpair LIBADD= spl -PACKAGE= runtime +PACKAGE= zfs # user INCS= libnvpair.h SRCS= libnvpair.c \ libnvpair_json.c \ nvpair_alloc_system.c # kernel SRCS+= nvpair_alloc_fixed.c \ nvpair.c \ fnvpair.c WARNS?= 2 CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID -DHAVE_CONFIG_H -DHAVE_XDR_BYTESREC CFLAGS.nvpair.c+= -UHAVE_RPC_TYPES .include diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index 6a918c59e27e..a06eef0b796c 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -1,50 +1,50 @@ # $FreeBSD$ .include .include .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl .PATH: ${SRCTOP}/sys/contrib/openzfs/include LIB= spl LIBADD= -PACKAGE= runtime +PACKAGE= zfs SRCS = \ assert.c \ list.c \ mkdirp.c \ os/freebsd/zone.c \ page.c \ timestamp.c \ include/sys/list.h \ include/sys/list_impl.h # These functions are not required when bootstrapping and the atomic code # will not compile when building on macOS. .if !defined(BOOTSTRAPPING) SRCS += \ atomic.c \ getexecname.c \ os/freebsd/getexecname.c \ os/freebsd/gethostid.c \ os/freebsd/getmntany.c \ os/freebsd/mnttab.c .endif WARNS?= 2 CSTD= c99 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h .if ${COMPILER_TYPE} == "clang" CFLAGS.atomic.c+= -Wno-error=atomic-alignment .endif .include diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile index 637385bc842e..d6a1d9fcfb7c 100644 --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -1,27 +1,27 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool .PATH: ${SRCTOP}/sys/contrib/openzfs/include LIB= tpool LIBADD= spl -PACKAGE= runtime +PACKAGE= zfs INCS= thread_pool_impl.h SRCS= thread_pool.c WARNS?= 2 CSTD= c99 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h .include diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile index ca8f5e665920..4e4ef2e69461 100644 --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem -PACKAGE= runtime +PACKAGE= zfs LIB= umem SRCS= umem.c WARNS?= 3 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem .include diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index fdbac6de2748..b67b88037246 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -1,26 +1,26 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil -PACKAGE= runtime +PACKAGE= zfs LIB= uutil SRCS=\ uu_alloc.c \ uu_avl.c \ uu_ident.c \ uu_list.c \ uu_misc.c \ uu_string.c WARNS?= 2 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h LIBADD= avl spl .include diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 63bfcb39d4d8..2551b9ebdd57 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -1,108 +1,108 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare .PATH: ${SRCTOP}/sys/contrib/openzfs/include .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib -PACKAGE= runtime +PACKAGE= zfs LIB= zfs LIBADD= \ avl \ bsdxml \ crypto \ geom \ m \ md \ nvpair \ pthread \ umem \ util \ uutil \ z \ zfs_core \ zutil INCS= libzfs.h USER_C = \ libzfs_changelist.c \ libzfs_config.c \ libzfs_crypto.c \ libzfs_dataset.c \ libzfs_diff.c \ libzfs_import.c \ libzfs_iter.c \ libzfs_mount.c \ libzfs_pool.c \ libzfs_sendrecv.c \ libzfs_status.c \ libzfs_util.c # FreeBSD USER_C += \ libzfs_compat.c \ libzfs_zmount.c # libshare USER_C += \ libshare.c \ nfs.c \ os/freebsd/nfs.c \ os/freebsd/smb.c KERNEL_C = \ algs/sha2/sha2.c \ cityhash.c \ zfeature_common.c \ zfs_comutil.c \ zfs_deleg.c \ zfs_fletcher.c \ zfs_fletcher_superscalar.c \ zfs_fletcher_superscalar4.c \ zfs_namecheck.c \ zfs_prop.c \ zpool_prop.c \ zprop_common.c ARCH_C = .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" ARCH_C += zfs_fletcher_intel.c \ zfs_fletcher_sse.c CFLAGS += -DHAVE_SSE2 .endif .if ${MACHINE_ARCH} == "amd64" ARCH_C += zfs_fletcher_avx512.c CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F .endif .if ${MACHINE_CPUARCH} == "aarch64" ARCH_C += zfs_fletcher_aarch64_neon.c .endif SRCS= $(USER_C) $(KERNEL_C) $(ARCH_C) WARNS?= 2 SHLIB_MAJOR= 4 CSTD= c99 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libshare CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h CFLAGS+= -DSYSCONFDIR=\"/etc\" CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\" .include diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index 5a7475f55428..f34494f1cc0a 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -1,33 +1,33 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core .PATH: ${SRCTOP}/sys/contrib/openzfs/include .PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs LIB= zfs_core LIBADD= nvpair spl zutil -PACKAGE= runtime +PACKAGE= zfs INCS= libzfs_core.h SRCS= libzfs_core.c \ os/freebsd/libzfs_core_ioctl.c \ zfs_ioctl_compat.c WARNS?= 2 CSTD= c99 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h .include diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile index be39af96124a..6c1643039514 100644 --- a/cddl/lib/libzfsbootenv/Makefile +++ b/cddl/lib/libzfsbootenv/Makefile @@ -1,36 +1,36 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv .PATH: ${SRCTOP}/sys/contrib/openzfs/include -PACKAGE= runtime +PACKAGE= zfs LIB= zfsbootenv SHLIB_MAJOR= 1 LIBADD= zfs LIBADD+= nvpair INCS= libzfsbootenv.h USER_C= \ lzbe_device.c \ lzbe_util.c \ lzbe_pair.c SRCS= $(USER_C) CSTD= c99 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs CFLAGS.lzbe_device.c= -Wno-cast-qual CFLAGS.lzbe_util.c= -Wno-cast-qual CFLAGS.lzbe_pair.c= -Wno-cast-qual .include diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 13671752fe88..aeb2b4175a3b 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -1,336 +1,337 @@ # $FreeBSD$ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs # ZFS_COMMON_SRCS .PATH: ${ZFSTOP}/module/zfs .PATH: ${ZFSTOP}/module/zcommon .PATH: ${ZFSTOP}/module/unicode # LUA_SRCS .PATH: ${ZFSTOP}/module/lua # ZSTD_SRCS .PATH: ${ZFSTOP}/module/zstd .PATH: ${ZFSTOP}/module/zstd/lib/common .PATH: ${ZFSTOP}/module/zstd/lib/compress .PATH: ${ZFSTOP}/module/zstd/lib/decompress .PATH: ${ZFSTOP}/module/os/linux/zfs .PATH: ${ZFSTOP}/lib/libzpool .if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} ATOMIC_SRCS= opensolaris_atomic.S ACFLAGS+= -Wa,--noexecstack .else .PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c .endif .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" # Don't waste GOT entries on small data. PICFLAG= -fPIC .endif +PACKAGE= zfs LIB= zpool USER_C = \ kernel.c \ taskq.c \ util.c KERNEL_C = \ zfeature_common.c \ zfs_comutil.c \ zfs_deleg.c \ zfs_fletcher.c \ zfs_fletcher_superscalar.c \ zfs_fletcher_superscalar4.c \ zfs_namecheck.c \ zfs_prop.c \ zfs_zstd.c \ zpool_prop.c \ zprop_common.c \ abd.c \ abd_os.c \ aggsum.c \ arc.c \ arc_os.c \ blake3_zfs.c \ blkptr.c \ bplist.c \ bpobj.c \ bptree.c \ btree.c \ bqueue.c \ cityhash.c \ dbuf.c \ dbuf_stats.c \ ddt.c \ ddt_zap.c \ dmu.c \ dmu_diff.c \ dmu_object.c \ dmu_objset.c \ dmu_recv.c \ dmu_redact.c \ dmu_send.c \ dmu_traverse.c \ dmu_tx.c \ dmu_zfetch.c \ dnode.c \ dnode_sync.c \ dsl_bookmark.c \ dsl_dataset.c \ dsl_deadlist.c \ dsl_deleg.c \ dsl_dir.c \ dsl_crypt.c \ dsl_pool.c \ dsl_prop.c \ dsl_scan.c \ dsl_synctask.c \ dsl_destroy.c \ dsl_userhold.c \ edonr_zfs.c \ entropy_common.c \ error_private.c \ fm.c \ fse_compress.c \ fse_decompress.c \ gzip.c \ hist.c \ hkdf.c \ huf_compress.c \ huf_decompress.c \ lzjb.c \ lz4.c \ lz4_zfs.c \ metaslab.c \ mmp.c \ multilist.c \ objlist.c \ pathname.c \ pool.c \ range_tree.c \ refcount.c \ rrwlock.c \ sa.c \ sha256.c \ skein_zfs.c \ spa.c \ spa_checkpoint.c \ spa_config.c \ spa_errlog.c \ spa_history.c \ spa_log_spacemap.c \ spa_misc.c \ spa_stats.c \ space_map.c \ space_reftree.c \ txg.c \ trace.c \ uberblock.c \ unique.c \ vdev.c \ vdev_cache.c \ vdev_draid.c \ vdev_draid_rand.c \ vdev_file.c \ vdev_indirect_births.c \ vdev_indirect.c \ vdev_indirect_mapping.c \ vdev_initialize.c \ vdev_label.c \ vdev_mirror.c \ vdev_missing.c \ vdev_queue.c \ vdev_raidz.c \ vdev_raidz_math_aarch64_neon.c \ vdev_raidz_math_aarch64_neonx2.c \ vdev_raidz_math_avx2.c \ vdev_raidz_math_avx512bw.c \ vdev_raidz_math_avx512f.c \ vdev_raidz_math.c \ vdev_raidz_math_scalar.c \ vdev_rebuild.c \ vdev_removal.c \ vdev_root.c \ vdev_trim.c \ xxhash.c \ zap.c \ zap_leaf.c \ zap_micro.c \ zcp.c \ zcp_get.c \ zcp_global.c \ zcp_iter.c \ zcp_set.c \ zcp_synctask.c \ zfeature.c \ zfs_byteswap.c \ zfs_chksum.c \ zfs_debug.c \ zfs_fm.c \ zfs_fuid.c \ zfs_sa.c \ zfs_znode.c \ zfs_racct.c \ zfs_ratelimit.c \ zfs_rlock.c \ zil.c \ zio.c \ zio_checksum.c \ zio_compress.c \ zio_crypt.c \ zio_inject.c \ zle.c \ zrlock.c \ zstd_common.c \ zstd_compress.c \ zstd_compress_literals.c \ zstd_compress_sequences.c \ zstd_compress_superblock.c \ zstd_ddict.c \ zstd_decompress.c \ zstd_decompress_block.c \ zstd_double_fast.c \ zstd_fast.c \ zstd_lazy.c \ zstd_ldm.c \ zstd_opt.c \ zthr.c ARCH_C = .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" ARCH_C += vdev_raidz_math_sse2.c \ vdev_raidz_math_ssse3.c \ zfs_fletcher_intel.c \ zfs_fletcher_sse.c CFLAGS += -DHAVE_SSE2 -DHAVE_SSE3 .endif .if ${MACHINE_ARCH} == "amd64" ARCH_C += zfs_fletcher_avx512.c CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ -DHAVE_AVX512BW .endif .if ${MACHINE_CPUARCH} == "aarch64" ARCH_C += zfs_fletcher_aarch64_neon.c .endif LUA_C = \ lapi.c \ lauxlib.c \ lbaselib.c \ lcode.c \ lcompat.c \ lcorolib.c \ lctype.c \ ldebug.c \ ldo.c \ lfunc.c \ lgc.c \ llex.c \ lmem.c \ lobject.c \ lopcodes.c \ lparser.c \ lstate.c \ lstring.c \ lstrlib.c \ ltable.c \ ltablib.c \ ltm.c \ lvm.c \ lzio.c UNICODE_C = u8_textprep.c uconv.c SRCS= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} WARNS?= 2 CFLAGS+= \ -DIN_BASE \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ -I${SRCTOP}/sys \ -I${ZFSTOP}/include/os/freebsd/zfs \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/module/icp/include \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ -I${SRCTOP}/sys/modules/zfs \ -I${ZFSTOP}/include/os/freebsd/zfs \ -DLIB_ZPOOL_BUILD -DZFS_DEBUG \ # XXX: pthread doesn't have mutex_owned() equivalent, so we need to look # into libthr private structures. That's sooo evil, but it's only for # ZFS debugging tools needs. CFLAGS+= -DWANTS_MUTEX_OWNED CFLAGS+= -I${SRCTOP}/lib/libpthread/thread CFLAGS+= -I${SRCTOP}/lib/libpthread/sys CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include CFLAGS.gcc+= -fms-extensions LIBADD= md pthread z spl icp nvpair avl umem # atomic.S doesn't like profiling. MK_PROFILE= no CSTD= c99 # Since there are many asserts in this library, it makes no sense to compile # it without debugging. CFLAGS+= -g -DDEBUG=1 # Pointer values are used as debugging "tags" to mark reference count # ownerships and in some cases the tag reference is dropped after an # object is freed. CFLAGS.dbuf.c= ${NO_WUSE_AFTER_FREE} CFLAGS.entropy_common.c= -fno-tree-vectorize CFLAGS.entropy_common.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.error_private.c= -fno-tree-vectorize CFLAGS.error_private.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.fse_compress.c= -fno-tree-vectorize CFLAGS.fse_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.fse_decompress.c= -fno-tree-vectorize CFLAGS.fse_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.hist.c= -fno-tree-vectorize CFLAGS.hist.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.huf_compress.c= -fno-tree-vectorize CFLAGS.huf_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.huf_decompress.c= -fno-tree-vectorize CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.pool.c= -fno-tree-vectorize CFLAGS.pool.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.xxhash.c= -fno-tree-vectorize CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_compress.c= -fno-tree-vectorize CFLAGS.zstd_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_compress_literals.c= -fno-tree-vectorize CFLAGS.zstd_compress_literals.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_compress_sequences.c= -fno-tree-vectorize CFLAGS.zstd_compress_sequences.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_compress_superblock.c= -fno-tree-vectorize CFLAGS.zstd_compress_superblock.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_double_fast.c= -fno-tree-vectorize CFLAGS.zstd_double_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_fast.c= -fno-tree-vectorize CFLAGS.zstd_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_lazy.c= -fno-tree-vectorize CFLAGS.zstd_lazy.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_ldm.c= -fno-tree-vectorize CFLAGS.zstd_ldm.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_opt.c= -fno-tree-vectorize CFLAGS.zstd_opt.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_ddict.c= -fno-tree-vectorize CFLAGS.zstd_ddict.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_decompress.c= -fno-tree-vectorize CFLAGS.zstd_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zstd_decompress_block.c= -fno-tree-vectorize CFLAGS.zstd_decompress_block.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} .include diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile index 2e6b53658b22..3c3855898a77 100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -1,41 +1,41 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs LIB= zutil LIBADD= avl geom m tpool -PACKAGE= runtime +PACKAGE= zfs INCS = zutil_import.h SRCS = \ zutil_device_path.c \ zutil_import.c \ zutil_import.h \ zutil_nicenum.c \ zutil_pool.c SRCS += \ os/freebsd/zutil_device_path_os.c \ os/freebsd/zutil_import_os.c SRCS += zfs_ioctl_compat.c WARNS?= 2 CSTD= c99 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h .include diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile index cf43802090dd..c35a8a6bd615 100644 --- a/cddl/lib/pam_zfs_key/Makefile +++ b/cddl/lib/pam_zfs_key/Makefile @@ -1,28 +1,28 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/contrib/pam_zfs_key .PATH: ${SRCTOP}/sys/contrib/openzfs/include -PACKAGE= utilities +PACKAGE= zfs LIB= pam_zfs_key SHLIBDIR?= /usr/lib LIBADD= zfs zfs_core nvpair uutil crypto SRCS= pam_zfs_key.c WARNS?= 2 CSTD= c99 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs CFLAGS+= -DRUNSTATEDIR=\"/var/run\" .include "../../lib/libpam/modules/Makefile.inc" .include diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index 6a6ef62e4fce..0babca17e98a 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -1,79 +1,79 @@ # $FreeBSD$ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zfs .PATH: ${ZFSTOP}/man/man7 .PATH: ${ZFSTOP}/man/man8 .PATH: ${ZFSTOP}/module/os/freebsd/spl -PACKAGE= runtime +PACKAGE= zfs PROG= zfs MAN= \ zfs.8 \ zfs-allow.8 \ zfs-bookmark.8 \ zfs-clone.8 \ zfs-create.8 \ zfs-destroy.8 \ zfs-diff.8 \ zfs-hold.8 \ zfs-jail.8 \ zfs-list.8 \ zfs-load-key.8 \ zfs-mount.8 \ zfs-program.8 \ zfs-project.8 \ zfs-promote.8 \ zfs-receive.8 \ zfs-rename.8 \ zfs-rollback.8 \ zfs-send.8 \ zfs-set.8 \ zfs-share.8 \ zfs-snapshot.8 \ zfs-upgrade.8 \ zfs-userspace.8 \ zfs-wait.8 \ zfsconcepts.7 \ zfsprops.7 MLINKS= \ zfs-allow.8 zfs-unallow.8 \ zfs-hold.8 zfs-release.8 \ zfs-jail.8 zfs-unjail.8 \ zfs-load-key.8 zfs-change-key.8 \ zfs-load-key.8 zfs-unload-key.8 \ zfs-mount.8 zfs-unmount.8 \ zfs-receive.8 zfs-recv.8 \ zfs-send.8 zfs-redact.8 \ zfs-set.8 zfs-get.8 \ zfs-set.8 zfs-inherit.8 \ zfs-userspace.8 zfs-groupspace.8 \ zfs-userspace.8 zfs-projectspace.8 SRCS= \ zfs_iter.c \ zfs_iter.h \ zfs_main.c \ zfs_util.h \ zfs_project.c \ zfs_projectutil.h WARNS?= 2 CFLAGS+= \ -DIN_BASE \ -I${ZFSTOP}/include \ -I${ZFSTOP}/include/os/freebsd \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ -I${SRCTOP}/sys \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/module/icp/include \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ -I${SRCTOP}/sys/modules/zfs LIBADD= jail avl nvpair geom uutil zfs_core spl tpool zutil zfs m crypto LDADD+= -pthread .include diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index 4c2a8b94de19..7020439a4366 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -1,80 +1,80 @@ # $FreeBSD$ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/man/man4 .PATH: ${ZFSTOP}/man/man5 .PATH: ${ZFSTOP}/man/man7 .PATH: ${ZFSTOP}/man/man8 .PATH: ${ZFSTOP}/cmd/zpool .PATH: ${ZFSTOP}/cmd/zpool/os/freebsd -PACKAGE= runtime +PACKAGE= zfs PROG= zpool MAN= \ spl.4 \ zfs.4 \ zpool.8 \ zpool-add.8 \ zpool-attach.8 \ zpool-checkpoint.8 \ zpool-clear.8 \ zpool-create.8 \ zpool-destroy.8 \ zpool-detach.8 \ zpool-events.8 \ zpool-export.8 \ zpool-features.7 \ zpool-get.8 \ zpool-history.8 \ zpool-import.8 \ zpool-initialize.8 \ zpool-iostat.8 \ zpool-labelclear.8 \ zpool-list.8 \ zpool-offline.8 \ zpool-reguid.8 \ zpool-remove.8 \ zpool-reopen.8 \ zpool-replace.8 \ zpool-resilver.8 \ zpool-scrub.8 \ zpool-split.8 \ zpool-status.8 \ zpool-sync.8 \ zpool-trim.8 \ zpool-upgrade.8 \ zpool-wait.8 \ zpoolconcepts.7 \ zpoolprops.7 MLINKS= \ zpool-offline.8 zpool-online.8 \ zpool-get.8 zpool-set.8 SRCS= \ zpool_iter.c \ zpool_main.c \ zpool_util.c \ zpool_util.h \ zpool_vdev.c \ zpool_vdev_os.c WARNS?= 2 CFLAGS+= \ -DIN_BASE \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ -I${SRCTOP}/sys \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/cmd/zpool \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ -DSYSCONFDIR=\"/etc\" \ -DPKGDATADIR=\"/usr/share/zfs\" LIBADD= geom nvpair uutil zfs zutil avl spl tpool zfs_core m LDADD+= -pthread .include diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile index 255f4a3542b3..da180b10e733 100644 --- a/cddl/share/zfs/compatibility.d/Makefile +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -1,53 +1,55 @@ # $FreeBSD$ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zpool/compatibility.d +PACKAGE= zfs + FILES= \ compat-2018 \ compat-2019 \ compat-2020 \ compat-2021 \ freebsd-11.0 \ freebsd-11.2 \ freebsd-11.3 \ freenas-9.10.2 \ grub2 \ openzfsonosx-1.7.0 \ openzfsonosx-1.8.1 \ openzfsonosx-1.9.3 \ openzfs-2.0-freebsd \ openzfs-2.0-linux \ openzfs-2.1-freebsd \ openzfs-2.1-linux \ zol-0.6.1 \ zol-0.6.4 \ zol-0.6.5 \ zol-0.7 \ zol-0.8 FILESDIR= ${SHAREDIR}/zfs/compatibility.d LINKS= \ ${FILESDIR}/compat-2018 ${FILESDIR}/2018 \ ${FILESDIR}/compat-2019 ${FILESDIR}/2019 \ ${FILESDIR}/compat-2020 ${FILESDIR}/2020 \ ${FILESDIR}/compat-2021 ${FILESDIR}/2021 \ ${FILESDIR}/freebsd-11.0 ${FILESDIR}/freebsd-11.1 \ ${FILESDIR}/freebsd-11.0 ${FILESDIR}/freenas-11.0 \ ${FILESDIR}/freebsd-11.2 ${FILESDIR}/freenas-11.2 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-11.4 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.0 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.1 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freebsd-12.2 \ ${FILESDIR}/freebsd-11.3 ${FILESDIR}/freenas-11.3 \ ${FILESDIR}/freenas-11.0 ${FILESDIR}/freenas-11.1 \ ${FILESDIR}/openzfsonosx-1.9.3 ${FILESDIR}/openzfsonosx-1.9.4 \ ${FILESDIR}/openzfs-2.0-freebsd ${FILESDIR}/truenas-12.0 \ ${FILESDIR}/zol-0.7 ${FILESDIR}/ubuntu-18.04 \ ${FILESDIR}/zol-0.8 ${FILESDIR}/ubuntu-20.04 LINKMODE= ${NOBINMODE} .include diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile index fcc472c24214..1e25b38d4eea 100644 --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -1,28 +1,29 @@ # $FreeBSD$ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zinject .PATH: ${ZFSTOP}/man/man8 +PACKAGE= zfs PROG= zinject INCS= zinject.h SRCS= zinject.c translate.c MAN= zinject.8 WARNS?= 2 CFLAGS+= \ -DIN_BASE \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ -I${SRCTOP}/sys \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/module/icp/include \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool .include diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile index 6296390592b3..7ed79e8149bf 100644 --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -1,36 +1,37 @@ # $FreeBSD$ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zstream .PATH: ${ZFSTOP}/man/man8 +PACKAGE= zfs PROG= zstream MAN= zstream.8 MLINKS= zstream.8 zstreamdump.8 INCS= zstream.h SRCS= \ zstream.c \ zstream_decompress.c \ zstream_dump.c \ zstream_redup.c \ zstream_token.c SYMLINKS= ${BINDIR}/zstream ${BINDIR}/zstreamdump WARNS?= 2 CFLAGS+= \ -DIN_BASE \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ -I${SRCTOP}/sys \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/module/icp/include \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h LIBADD= geom m nvpair umem uutil avl spl zfs_core zfs zutil zpool .include diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index 91118d13775d..3778cd1316d4 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -1,37 +1,38 @@ # $FreeBSD$ .include ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd .PATH: ${ZFSTOP}/man/man1 +PACKAGE= zfs PROG= ztest MAN= ztest.1 WARNS?= 2 CFLAGS+= \ -DIN_BASE \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ -I${SRCTOP}/cddl/compat/opensolaris/include \ -I${ZFSTOP}/module/icp/include \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID \ -include ${SRCTOP}/sys/modules/zfs/zfs_config.h LIBADD= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp CSTD= c99 # Since there are many asserts in this program, it makes no sense to compile # it without debugging. CFLAGS+= -g -DDEBUG=1 -Wno-format -DZFS_DEBUG=1 CFLAGS.gcc+= -fms-extensions HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index efd8c746128f..3be2dea0bb95 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -1,33 +1,34 @@ # $FreeBSD$ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zdb .PATH: ${ZFSTOP}/man/man8 +PACKAGE= zfs PROG= zdb MAN= zdb.8 INCS= zdb.h SRCS= zdb.c zdb_il.c WARNS?= 2 CSTD= c99 CFLAGS+= \ -DIN_BASE \ -I${ZFSTOP}/include \ -I${ZFSTOP}/lib/libspl/include \ -I${ZFSTOP}/lib/libspl/include/os/freebsd \ -I${ZFSTOP}/lib/libspl/include/os/freebsd/spl \ -I${SRCTOP}/sys \ -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ -DHAVE_ISSETUGID LIBADD= nvpair umem uutil zfs spl avl zutil zpool CFLAGS.gcc+= -fms-extensions # Since there are many asserts in this program, it makes no sense to compile # it without debugging. CFLAGS+= -g -DDEBUG=1 -DZFS_DEBUG=1 .include diff --git a/cddl/usr.sbin/zfsd/Makefile b/cddl/usr.sbin/zfsd/Makefile index 88eb9220a8cc..e263a47cb422 100644 --- a/cddl/usr.sbin/zfsd/Makefile +++ b/cddl/usr.sbin/zfsd/Makefile @@ -1,13 +1,14 @@ # $FreeBSD$ .include .include "Makefile.common" +PACKAGE= zfs PROG_CXX= zfsd MAN= zfsd.8 HAS_TESTS= SUBDIR.${MK_GOOGLETEST}+= tests .include diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile index ffac0785d18d..faedd5bc7d2b 100644 --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -1,29 +1,30 @@ # $FreeBSD$ .PATH: ${SRCTOP}/sys/contrib/openzfs/cmd +PACKAGE= zfs PROG= zhack MAN= WARNS?= 0 CSTD= c99 WARNS?= 2 CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h LIBADD= nvpair zfs spl zutil zpool CFLAGS+= -DDEBUG=1 #DEBUG_FLAGS+= -g .include diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile index 3c66ea9f1cf0..7c8247b80402 100644 --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -1,74 +1,74 @@ # $FreeBSD$ SHLIBDIR?= /lib .include -PACKAGE= runtime +PACKAGE= zfs LIB= be SHLIB_MAJOR= 1 SHLIB_MINOR= 0 SRCS= be.c be_access.c be_error.c be_info.c INCS= be.h MAN= libbe.3 MLINKS+= libbe.3 be_activate.3 MLINKS+= libbe.3 be_active_name.3 MLINKS+= libbe.3 be_active_path.3 MLINKS+= libbe.3 be_create_depth.3 MLINKS+= libbe.3 be_create_from_existing_snap.3 MLINKS+= libbe.3 be_create_from_existing.3 MLINKS+= libbe.3 be_create.3 MLINKS+= libbe.3 be_deactivate.3 MLINKS+= libbe.3 be_destroy.3 MLINKS+= libbe.3 be_exists.3 MLINKS+= libbe.3 be_export.3 MLINKS+= libbe.3 be_get_bootenv_props.3 MLINKS+= libbe.3 be_get_dataset_props.3 MLINKS+= libbe.3 be_get_dataset_snapshots.3 MLINKS+= libbe.3 be_import.3 MLINKS+= libbe.3 be_is_auto_snapshot_name.3 MLINKS+= libbe.3 be_mount.3 MLINKS+= libbe.3 be_mounted_at.3 MLINKS+= libbe.3 be_nextboot_name.3 MLINKS+= libbe.3 be_nextboot_path.3 MLINKS+= libbe.3 be_nicenum.3 MLINKS+= libbe.3 be_prop_list_alloc.3 MLINKS+= libbe.3 be_prop_list_free.3 MLINKS+= libbe.3 be_rename.3 MLINKS+= libbe.3 be_root_concat.3 MLINKS+= libbe.3 be_root_path.3 MLINKS+= libbe.3 be_snapshot.3 MLINKS+= libbe.3 be_unmount.3 MLINKS+= libbe.3 be_validate_name.3 MLINKS+= libbe.3 be_validate_snap.3 MLINKS+= libbe.3 libbe_close.3 MLINKS+= libbe.3 libbe_errno.3 MLINKS+= libbe.3 libbe_error_description.3 MLINKS+= libbe.3 libbe_init.3 MLINKS+= libbe.3 libbe_print_on_error.3 LIBADD+= zfs LIBADD+= nvpair LIBADD+= spl LIBADD+= zfsbootenv CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS.be.c= -Wno-cast-qual CFLAGS.be_access.c= -Wno-cast-qual CFLAGS.be_error.c= -Wno-cast-qual CFLAGS.be_info.c= -Wno-cast-qual HAS_TESTS= YES SUBDIR.${MK_TESTS}+= tests .include diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index ccaba970489c..dce9ae912786 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -1,150 +1,152 @@ # # $FreeBSD$ # acct_COMMENT= System Accounting Utilities acct_DESC= System Accounting Utilities acpi_COMMENT= ACPI Utilities acpi_DESC= ACPI Utilities amd_COMMENT= AMD Utilities amd_DESC= AMD Utilities apm_COMMENT= APM Utilities apm_DESC= APM Utilities at_COMMENT= AT Utilities at_DESC= AT Utilities autofs_COMMENT= Autofs Utilities autofs_DESC= Autofs Utilities bhyve_COMMENT= Bhyve Utilities bhyve_DESC= Bhyve Utilities binutils_COMMENT= Binutils binutils_DESC= Binutils bluetooth_COMMENT= Bluetooth Utilities bluetooth_DESC= Bluetooth Utilities bootloader_COMMENT= Bootloader bootloader_DESC= Bootloader and configuration files bsdinstall_COMMENT= BSDInstall Utilities bsdinstall_DESC= BSDInstall Utilities bsnmp_COMMENT= BSNMP Utilities bsnmp_DESC= BSNMP Utilities clang_COMMENT= Clang Utilities clang_DESC= Clang Utilities clibs_COMMENT= Core C Libraries clibs_DESC= Core C Libraries csh_COMMENT= C Shell csh_DESC= C Shell cxgbe-tools_COMMENT= Chelsio cxbge Utilities cxgbe-tools_DESC= Chelsio cxbge Utilities dhclient_COMMENT= DHCP Client dhclient_DESC= DHCP Client dma_COMMENT= DMA Mail Agent Utilities dma_DESC= DMA Mail Agent Utilities docs_COMMENT= Documentation docs_DESC= Documentation dtrace_COMMENT= Dtrace Utilities dtrace_DESC= Dtrace Utilities dwatch_COMMENT= Dwatch Utilities dwatch_DESC= Dwatch Utilities ee_COMMENT= Easy Editor Utilities ee_DESC= Easy Editor Utilities efi-tools_COMMENT= UEFI Utilities efi-tools_DESC= UEFI Utilities fetch_COMMENT= Fetch Utility fetch_DESC= Fetch Utility ftp_COMMENT= FTP Utilities ftp_DESC= FTP Utilities ftpd_COMMENT= FTP Daemon ftpd_DESC= FTP Daemon gdb_COMMENT= GDB Utilities gdb_DESC= GDB Utilities geom_COMMENT= GEOM Utilitites geom_DESC= GEOM Utilitites ggate_COMMENT= GEOM Gate Utilities ggate_DESC= GEOM Gate Utilities groff_COMMENT= Groff Utilities groff_DESC= Groff Utilities hast_COMMENT= Highly Available Storage daemon hast_DESC= Highly Available Storage daemon hostapd_COMMENT= 802.11 Access Point Daemon an Utilities hostapd_DESC= 802.11 Access Point Daemon an Utilities hyperv-tools_COMMENT= Microsoft HyperV Utilities hyperv-tools_DESC= Microsoft HyperV Utilities jail_COMMENT= Jail Utilities jail_DESC= Jail Utilities jail-debug_DESCR= Debugging Symbols jail-development_DESCR=Development Files jail-profile_DESCR= Profiling Libraries jail-lib32_DESCR= 32-bit Libraries jail-lib32-debug_DESCR=32-bit Debugging Symbols jail-lib32-development_DESCR=32-bit Development Files jail-lib32-profile_DESCR=32-bit Profiling Libraries kerberos_COMMENT= Kerberos Utilities kerberos_DESC= Kerberos Utilities kerberos-lib_COMMENT= Kerberos Libraries kerberos-lib_DESC= Kerberos Libraries kernel_COMMENT= FreeBSD Kernel kernel_DESC= FreeBSD Kernel manuals_COMMENT= Manual Pages manuals_DESC= Manual Pages mlx-tools_COMMENT= Mellanox Utilities mlx-tools_DESC= Mellanox Utilities mtree_COMMENT= MTREE Files mtree_DESC= MTREE Files newsyslog_COMMENT= Newsyslog Utility newsyslog_DESC= Newsyslog Utility nfs_COMMENT= NFS Utilities nfs_DESC= NFS Utilities nvme-tools_COMMENT= NVME Utilities nvme-tools_DESC= NVME Utilities openssl_COMMENT= OpenSSL Library and Utility openssl_DESC= OpenSSL Library and Utility pkg-bootstrap_COMMENT= pkg bootstrap Utility pkg-bootstrap_DESC= pkg bootstrap Utility periodic_COMMENT= Periodic Utility periodic_DESC= Periodic Utility rc_COMMENT= RC Scripts rc_DESC= RC Scripts rcmds_COMMENT= Remote Command Utilities rcmds_DESC= Remote Command Utilities rdma_COMMENT= RDMA Utilities rdma_DESC= RDMA Utilities rescue_COMMENT= Rescue Utilities rescue_DESC= Rescue Utilities resolvconf_COMMENT= Resolvconf Utility and scripts resolvconf_DESC= Resolvconf Utility and scripts runtime_COMMENT= FreeBSD Base System runtime_DESC= FreeBSD Base System runtime-debug_DESCR= Debugging Symbols runtime-development_DESCR=Development Files runtime-profile_DESCR= Profiling Libraries runtime-lib32_DESCR= 32-bit Libraries runtime-lib32-debug_DESCR=32-bit Debugging Symbols runtime-lib32-development_DESCR=32-bit Development Files runtime-lib32-profile_DESCR=32-bit Profiling Libraries sendmail_COMMENT= Sendmail Utilities sendmail_DESC= Sendmail Utilities ssh_COMMENT= Secure Shell Utilities ssh_DESC= Secure Shell Utilities svn_COMMENT= Subversion Version Control System svn_DESC= Subversion Version Control System syscons_COMMENT= Syscons Console syscons_DESC= Syscons Console syslogd_COMMENT= Syslog Daemon syslogd_DESC= Syslog Daemon tcpd_COMMENT= TCP Wrapper utilities tcpd_DESC= TCP Wrapper utilities telnet_COMMENT= Telnet client telnet_DESC= Telnet client tests_COMMENT= Test Suite tests_DESC= Test Suite unbound_COMMENT= Unbound DNS Resolver unbound_DESC= Unbound DNS Resolver utilities_COMMENT= Non-vital programs and libraries utilities_DESC= Non-vital programs and libraries vi_COMMENT= Vi Editor vi_DESC= Vi Editor vt_COMMENT= VT fonts and keyboard files vt_DESC= VT fonts and keyboard files wpa_COMMENT= 802.11 Supplicant wpa_DESC= 802.11 Supplicant yp_COMMENT= Yellow Pages programs yp_DESC= Yellow Pages programs +zfs_COMMENT= ZFS Libraries and Utilities +zfs_DESC= ZFS Libraries and Utilities diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile index 46d43306b9ca..fe2e6087e243 100644 --- a/sbin/bectl/Makefile +++ b/sbin/bectl/Makefile @@ -1,32 +1,32 @@ # $FreeBSD$ .include -PACKAGE=runtime +PACKAGE=zfs PROG= bectl MAN= bectl.8 SRCS= bectl.c bectl_jail.c bectl_list.c LIBADD+= be \ jail \ nvpair \ spl \ util \ zfsbootenv CFLAGS+= -DIN_BASE CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd CFLAGS+= -I${SRCTOP}/sys CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h CFLAGS+= -DHAVE_ISSETUGID CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h HAS_TESTS= yes SUBDIR.${MK_TESTS}+= tests .include