Page MenuHomeFreeBSD
Files F136663023

D53790.id166586.diff
No OneTemporary
Actions

D53790.id166586.diff
View Options

diff --git a/cddl/lib/libtpool/tests/Makefile b/cddl/lib/libtpool/tests/Makefile
--- a/cddl/lib/libtpool/tests/Makefile
+++ b/cddl/lib/libtpool/tests/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
ATF_TESTS_C+= libtpool_test
TEST_METADATA+= timeout="10"
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/lib/libzpool
# ZFS_COMMON_SRCS
diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/cmd/zfs
.PATH: ${ZFSTOP}/man/man7
.PATH: ${ZFSTOP}/man/man8
diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/man/man4
.PATH: ${ZFSTOP}/man/man5
.PATH: ${ZFSTOP}/man/man7
diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile
--- a/cddl/share/zfs/compatibility.d/Makefile
+++ b/cddl/share/zfs/compatibility.d/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/cmd/zpool/compatibility.d
PACKAGE= zfs
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/cmd/zinject
.PATH: ${ZFSTOP}/man/man8
diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile
--- a/cddl/usr.bin/zstream/Makefile
+++ b/cddl/usr.bin/zstream/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/cmd/zstream
.PATH: ${ZFSTOP}/man/man8
diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile
--- a/cddl/usr.bin/ztest/Makefile
+++ b/cddl/usr.bin/ztest/Makefile
@@ -1,7 +1,5 @@
.include <src.opts.mk>
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/cmd
.PATH: ${ZFSTOP}/man/man1
diff --git a/cddl/usr.libexec/zfs_prepare_disk/Makefile b/cddl/usr.libexec/zfs_prepare_disk/Makefile
--- a/cddl/usr.libexec/zfs_prepare_disk/Makefile
+++ b/cddl/usr.libexec/zfs_prepare_disk/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/scripts
PACKAGE= zfs
diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile
--- a/cddl/usr.libexec/zpool_influxdb/Makefile
+++ b/cddl/usr.libexec/zpool_influxdb/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/cmd/zpool_influxdb
.PATH: ${ZFSTOP}/man/man8
diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile
--- a/cddl/usr.sbin/zdb/Makefile
+++ b/cddl/usr.sbin/zdb/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/cmd/zdb
.PATH: ${ZFSTOP}/man/man8
diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile
--- a/cddl/usr.sbin/zhack/Makefile
+++ b/cddl/usr.sbin/zhack/Makefile
@@ -1,5 +1,3 @@
-ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
-
.PATH: ${ZFSTOP}/cmd
.PATH: ${ZFSTOP}/man/man1
diff --git a/share/mk/src.sys.mk b/share/mk/src.sys.mk
--- a/share/mk/src.sys.mk
+++ b/share/mk/src.sys.mk
@@ -48,6 +48,9 @@
DEFAULTWARNS?= 6
+# ZFS source directory
+ZFSTOP= ${SRCTOP}/sys/contrib/openzfs
+
# tempting, but bsd.compiler.mk causes problems this early
# probably need to remove dependence on bsd.own.mk
#.include "src.opts.mk"

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 19, 7:24 PM (2 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25588983
Default Alt Text
D53790.id166586.diff (3 KB)

Event Timeline