aboutsummaryrefslogtreecommitdiff
path: root/cddl/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'cddl/usr.bin')
-rw-r--r--cddl/usr.bin/Makefile17
-rw-r--r--cddl/usr.bin/Makefile.inc1
-rw-r--r--cddl/usr.bin/ctfconvert/Makefile2
-rw-r--r--cddl/usr.bin/ctfconvert/Makefile.depend4
-rw-r--r--cddl/usr.bin/ctfconvert/ctfconvert.12
-rw-r--r--cddl/usr.bin/ctfconvert/tests/Makefile1
-rw-r--r--cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh1
-rw-r--r--cddl/usr.bin/ctfdump/Makefile2
-rw-r--r--cddl/usr.bin/ctfdump/Makefile.depend2
-rw-r--r--cddl/usr.bin/ctfdump/ctfdump.12
-rw-r--r--cddl/usr.bin/ctfmerge/Makefile2
-rw-r--r--cddl/usr.bin/ctfmerge/Makefile.depend3
-rw-r--r--cddl/usr.bin/ctfmerge/ctfmerge.12
-rw-r--r--cddl/usr.bin/tests/Makefile1
-rw-r--r--cddl/usr.bin/tests/Makefile.depend1
-rw-r--r--cddl/usr.bin/zinject/Makefile2
-rw-r--r--cddl/usr.bin/zinject/Makefile.depend10
-rw-r--r--cddl/usr.bin/zstream/Makefile4
-rw-r--r--cddl/usr.bin/ztest/Makefile2
-rw-r--r--cddl/usr.bin/ztest/Makefile.depend10
-rw-r--r--cddl/usr.bin/ztest/tests/Makefile1
-rwxr-xr-xcddl/usr.bin/ztest/tests/ztest.sh1
22 files changed, 21 insertions, 52 deletions
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 10d55215c0b3..ccf441cbabeb 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -1,22 +1,17 @@
-# $FreeBSD$
.include <src.opts.mk>
-SUBDIR= \
+SUBDIR.${MK_DTRACE}+= \
ctfconvert \
ctfdump \
- ctfmerge \
- ${_zinject} \
- ${_zstream} \
- ${_ztest}
+ ctfmerge
SUBDIR.${MK_TESTS}+= tests
-.if ${MK_ZFS} != "no"
-_zinject= zinject
-_ztest= ztest
-_zstream = zstream
-.endif
+SUBDIR.${MK_ZFS}+= \
+ zinject \
+ ztest \
+ zstream
SUBDIR_PARALLEL=
diff --git a/cddl/usr.bin/Makefile.inc b/cddl/usr.bin/Makefile.inc
index 4cec6fe01a45..78a3af23f3cc 100644
--- a/cddl/usr.bin/Makefile.inc
+++ b/cddl/usr.bin/Makefile.inc
@@ -1,4 +1,3 @@
-# $FreeBSD$
BINDIR?= /usr/bin
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
index 78b65020452a..5dd38fbb5329 100644
--- a/cddl/usr.bin/ctfconvert/Makefile
+++ b/cddl/usr.bin/ctfconvert/Makefile
@@ -1,10 +1,10 @@
-# $FreeBSD$
.include <src.opts.mk>
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
+PACKAGE= ctf-tools
PROG= ctfconvert
SRCS= alist.c \
ctf.c \
diff --git a/cddl/usr.bin/ctfconvert/Makefile.depend b/cddl/usr.bin/ctfconvert/Makefile.depend
index eb40124b7c90..69aabda6c27e 100644
--- a/cddl/usr.bin/ctfconvert/Makefile.depend
+++ b/cddl/usr.bin/ctfconvert/Makefile.depend
@@ -1,11 +1,9 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
+ cddl/lib/libspl \
include \
include/xlocale \
- cddl/lib/libspl \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
diff --git a/cddl/usr.bin/ctfconvert/ctfconvert.1 b/cddl/usr.bin/ctfconvert/ctfconvert.1
index c7b01c9315ce..7697513d0740 100644
--- a/cddl/usr.bin/ctfconvert/ctfconvert.1
+++ b/cddl/usr.bin/ctfconvert/ctfconvert.1
@@ -26,8 +26,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd April 21, 2022
.Dt CTFCONVERT 1
.Os
diff --git a/cddl/usr.bin/ctfconvert/tests/Makefile b/cddl/usr.bin/ctfconvert/tests/Makefile
index 431a1f25bd9f..101282261dd0 100644
--- a/cddl/usr.bin/ctfconvert/tests/Makefile
+++ b/cddl/usr.bin/ctfconvert/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
ATF_TESTS_SH+= ctfconvert_test
diff --git a/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh b/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh
index 04723fd08ad3..f19383cfbb4f 100644
--- a/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh
+++ b/cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh
@@ -23,7 +23,6 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
#
usage_output='Usage: ctfconvert'
diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
index d7ddd45d9778..60ae9a0033b7 100644
--- a/cddl/usr.bin/ctfdump/Makefile
+++ b/cddl/usr.bin/ctfdump/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump
+PACKAGE= ctf-tools
PROG= ctfdump
SRCS= dump.c \
symbol.c \
diff --git a/cddl/usr.bin/ctfdump/Makefile.depend b/cddl/usr.bin/ctfdump/Makefile.depend
index ceebc6a83a34..edb476e399d9 100644
--- a/cddl/usr.bin/ctfdump/Makefile.depend
+++ b/cddl/usr.bin/ctfdump/Makefile.depend
@@ -1,8 +1,6 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/cddl/usr.bin/ctfdump/ctfdump.1 b/cddl/usr.bin/ctfdump/ctfdump.1
index 68764d11b0f9..27dfe6563645 100644
--- a/cddl/usr.bin/ctfdump/ctfdump.1
+++ b/cddl/usr.bin/ctfdump/ctfdump.1
@@ -26,8 +26,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd April 21, 2022
.Dt CTFDUMP 1
.Os
diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
index e9c8e505ed76..e7ad35ab097d 100644
--- a/cddl/usr.bin/ctfmerge/Makefile
+++ b/cddl/usr.bin/ctfmerge/Makefile
@@ -1,8 +1,8 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
+PACKAGE= ctf-tools
PROG= ctfmerge
SRCS= alist.c \
barrier.c \
diff --git a/cddl/usr.bin/ctfmerge/Makefile.depend b/cddl/usr.bin/ctfmerge/Makefile.depend
index 32a1985bd180..e724f22559ff 100644
--- a/cddl/usr.bin/ctfmerge/Makefile.depend
+++ b/cddl/usr.bin/ctfmerge/Makefile.depend
@@ -1,8 +1,7 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
- gnu/lib/csu \
+ cddl/lib/libspl \
include \
include/xlocale \
lib/${CSU_DIR} \
diff --git a/cddl/usr.bin/ctfmerge/ctfmerge.1 b/cddl/usr.bin/ctfmerge/ctfmerge.1
index b84bd8c84ead..2bc70db82dc9 100644
--- a/cddl/usr.bin/ctfmerge/ctfmerge.1
+++ b/cddl/usr.bin/ctfmerge/ctfmerge.1
@@ -26,8 +26,6 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
-.\"
.Dd April 21, 2022
.Dt CTFMERGE 1
.Os
diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile
index 3b3078f8612a..b8996030aafc 100644
--- a/cddl/usr.bin/tests/Makefile
+++ b/cddl/usr.bin/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
diff --git a/cddl/usr.bin/tests/Makefile.depend b/cddl/usr.bin/tests/Makefile.depend
index f80275d86ab1..11aba52f82cf 100644
--- a/cddl/usr.bin/tests/Makefile.depend
+++ b/cddl/usr.bin/tests/Makefile.depend
@@ -1,4 +1,3 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index fcc472c24214..71cd4776d339 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -1,10 +1,10 @@
-# $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
diff --git a/cddl/usr.bin/zinject/Makefile.depend b/cddl/usr.bin/zinject/Makefile.depend
index dfb2563fa7d1..c36e0e5ad2e7 100644
--- a/cddl/usr.bin/zinject/Makefile.depend
+++ b/cddl/usr.bin/zinject/Makefile.depend
@@ -1,27 +1,21 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
cddl/lib/libavl \
cddl/lib/libnvpair \
+ cddl/lib/libspl \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \
- gnu/lib/csu \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libmd \
- lib/libsbuf \
- lib/libthr \
- lib/libutil \
- lib/libz \
lib/msun \
diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile
index cfcff71a813f..4444973b2211 100644
--- a/cddl/usr.bin/zstream/Makefile
+++ b/cddl/usr.bin/zstream/Makefile
@@ -1,17 +1,19 @@
-# $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_recompress.c \
zstream_redup.c \
zstream_token.c
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
index 91118d13775d..2913349eccc1 100644
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <src.opts.mk>
@@ -7,6 +6,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
.PATH: ${ZFSTOP}/cmd
.PATH: ${ZFSTOP}/man/man1
+PACKAGE= zfs
PROG= ztest
MAN= ztest.1
diff --git a/cddl/usr.bin/ztest/Makefile.depend b/cddl/usr.bin/ztest/Makefile.depend
index dfb2563fa7d1..dd387951fe20 100644
--- a/cddl/usr.bin/ztest/Makefile.depend
+++ b/cddl/usr.bin/ztest/Makefile.depend
@@ -1,27 +1,23 @@
-# $FreeBSD$
# Autogenerated - do NOT edit!
DIRDEPS = \
cddl/lib/libavl \
+ cddl/lib/libicp \
cddl/lib/libnvpair \
+ cddl/lib/libspl \
cddl/lib/libumem \
cddl/lib/libuutil \
cddl/lib/libzfs \
cddl/lib/libzfs_core \
cddl/lib/libzpool \
- gnu/lib/csu \
+ cddl/lib/libzutil \
include \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
- lib/libexpat \
lib/libgeom \
- lib/libmd \
- lib/libsbuf \
lib/libthr \
- lib/libutil \
- lib/libz \
lib/msun \
diff --git a/cddl/usr.bin/ztest/tests/Makefile b/cddl/usr.bin/ztest/tests/Makefile
index edf2a537dbe3..824497940b20 100644
--- a/cddl/usr.bin/ztest/tests/Makefile
+++ b/cddl/usr.bin/ztest/tests/Makefile
@@ -1,4 +1,3 @@
-# $FreeBSD$
.include <bsd.own.mk>
diff --git a/cddl/usr.bin/ztest/tests/ztest.sh b/cddl/usr.bin/ztest/tests/ztest.sh
index 9945d1a45aa9..8bc377917992 100755
--- a/cddl/usr.bin/ztest/tests/ztest.sh
+++ b/cddl/usr.bin/ztest/tests/ztest.sh
@@ -1,6 +1,5 @@
#
# Test Case: ztest
-# $FreeBSD$
#
atf_test_case ztest
ztest_head()
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 05:31:16 +0000