aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
Diffstat (limited to 'cddl')
-rw-r--r--cddl/lib/libctf/Makefile2
-rw-r--r--cddl/share/zfs/compatibility.d/Makefile5
-rw-r--r--cddl/usr.bin/ctfconvert/Makefile2
-rw-r--r--cddl/usr.bin/ctfdump/Makefile2
-rw-r--r--cddl/usr.bin/ctfmerge/Makefile2
5 files changed, 9 insertions, 4 deletions
diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile
index 10854482cd21..1c605182bc1d 100644
--- a/cddl/lib/libctf/Makefile
+++ b/cddl/lib/libctf/Makefile
@@ -2,6 +2,8 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common
.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf
+PACKAGE= ctf
+LIB_PACKAGE=
LIB= ctf
SRCS= ctf_create.c \
ctf_decl.c \
diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile
index 6cdb64b0fccb..6d3663081ae6 100644
--- a/cddl/share/zfs/compatibility.d/Makefile
+++ b/cddl/share/zfs/compatibility.d/Makefile
@@ -24,6 +24,7 @@ FILES= \
openzfs-2.1-linux \
openzfs-2.2 \
openzfs-2.3 \
+ openzfs-2.4 \
zol-0.6.1 \
zol-0.6.4 \
zol-0.6.5 \
@@ -60,7 +61,9 @@ LINKS= \
${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-linux \
${FILESDIR}/openzfs-2.2 ${FILESDIR}/openzfs-2.2-freebsd \
${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-linux \
- ${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-freebsd
+ ${FILESDIR}/openzfs-2.3 ${FILESDIR}/openzfs-2.3-freebsd \
+ ${FILESDIR}/openzfs-2.4 ${FILESDIR}/openzfs-2.4-linux \
+ ${FILESDIR}/openzfs-2.4 ${FILESDIR}/openzfs-2.4-freebsd
LINKMODE= ${NOBINMODE}
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
index cd9f850f480c..df53c46b7246 100644
--- a/cddl/usr.bin/ctfconvert/Makefile
+++ b/cddl/usr.bin/ctfconvert/Makefile
@@ -3,7 +3,7 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
-PACKAGE= ctf-tools
+PACKAGE= ctf
PROG= ctfconvert
SRCS= alist.c \
ctf.c \
diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
index 23ded7458bed..357598583ae7 100644
--- a/cddl/usr.bin/ctfdump/Makefile
+++ b/cddl/usr.bin/ctfdump/Makefile
@@ -1,7 +1,7 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump
-PACKAGE= ctf-tools
+PACKAGE= ctf
PROG= ctfdump
SRCS= dump.c \
symbol.c \
diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
index 4cd9511f911c..81bccc047a25 100644
--- a/cddl/usr.bin/ctfmerge/Makefile
+++ b/cddl/usr.bin/ctfmerge/Makefile
@@ -1,7 +1,7 @@
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
-PACKAGE= ctf-tools
+PACKAGE= ctf
PROG= ctfmerge
SRCS= alist.c \
barrier.c \