From nobody Mon Nov 24 15:54:20 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dFVkN6cW6z6HPbk for ; Mon, 24 Nov 2025 15:54:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dFVkN5vnhz3qMD for ; Mon, 24 Nov 2025 15:54:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763999660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3bAc4K8FBSnnG6seGNFfNDn9YaUs/G1K+ermz64Jjnc=; b=g2xzjSr1c/JunkufAZpKDsMymfEoNFvdtruUnWHhzEHfAGAvJbugOSouLoLzglj64vwHz4 hHUiKOJivGmI5j4GFamyFd7y/sAnnRiemnHzQiy2BMLKkuSMJiayL7i408Zc5nM987h1uF H5jh4uOIBmnRPvNTNL4cWqmWJRa7nw68fgdSxE0LjH9ffiAREb8qwS8U09Nd3UY77F6dM1 N15WnkPvZgn8lc70A8FPnl67GTUJGMEwXEV2T0WRd02LhcxwJErawTz36m6qePeNwQ9eHD x+9uWdQkMOSfJpAriNhwyMQEDZzedZHj9ChR8Kh1KpxQza5w7Uo/8UN3nV5X1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763999660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3bAc4K8FBSnnG6seGNFfNDn9YaUs/G1K+ermz64Jjnc=; b=Izp+4zLJTjhAzx5+OxoZBxfWP1hvoXT2M2w417xQ+WGhSw2O0pjVZ187JW95yG2uN2hmco b4lmCSqtvgMJYwbxmip39ZJCijbHsa4hd5FdfqIXMCv/taJqGJhuVg2d9XgrQiiwDpouBI jQKJ9fLfOrqtoGcCgvvD0RafGUWD325w4/lsuG2qvZsaJ6fDKYzg3Ru4bt7vTqtI84nq9F SW0GJJc/VH9QmPNb/QxfJVGptiGX5I0eO+8PSmURT1qgqZxpDUATfGNIXla9Mx3dgA9g4h 6lqYoGgTX1re8f6Hbwade3E747ZVZXnnRWjOWxJ33wtEQV/EtYiDTre1Jx1XgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763999660; a=rsa-sha256; cv=none; b=l+uZ5Mf9dnTaPEHYeg3NoSNTM71xa4WSDlTiIlhXoKa8oON8yEHCIBP27DxOhRmKIGYSRQ xF/54c+KljFSs+HMJRxhP1uWcSODfFfIft3sfRKqP2id0MbGvPlhWP6EeR6vqVG9CAeZqw N3AlgEgxbItywRlTjWeJyWbDfpoGoY3Weum3PZ7wfwwlgIr4e/FC6+h5W0Bt7l06zRg5UB Wtyh16kfxch4pfpg/EbSNwVxBiavFT6NSKf7j+ah1IG4Jv1Wx398dI4nqviR3m8wcK3cfm QEuF+kItqE4826HZYGeveDsU9dDTu9fHW8b2z9QqvZQmeeVRhWOw3XVdPs7QTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dFVkN4phjz60S for ; Mon, 24 Nov 2025 15:54:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 341f0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Nov 2025 15:54:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 7980cf5d6f71 - main - Centralize definition of ZFSTOP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7980cf5d6f71adef3ca38825f4aa8aa38a59e43c Auto-Submitted: auto-generated Date: Mon, 24 Nov 2025 15:54:20 +0000 Message-Id: <69247fac.341f0.314bfe7e@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=7980cf5d6f71adef3ca38825f4aa8aa38a59e43c commit 7980cf5d6f71adef3ca38825f4aa8aa38a59e43c Author: John Baldwin AuthorDate: 2025-11-24 15:46:56 +0000 Commit: John Baldwin CommitDate: 2025-11-24 15:46:56 +0000 Centralize definition of ZFSTOP Define this helper variable in one place and make it available while building the entire base system. Reviewed by: sjg Obtained from: CheriBSD (mostly) Differential Revision: https://reviews.freebsd.org/D53790 --- cddl/lib/libtpool/tests/Makefile | 2 -- cddl/lib/libzpool/Makefile | 2 -- cddl/sbin/zfs/Makefile | 2 -- cddl/sbin/zpool/Makefile | 2 -- cddl/share/zfs/compatibility.d/Makefile | 2 -- cddl/usr.bin/zinject/Makefile | 2 -- cddl/usr.bin/zstream/Makefile | 2 -- cddl/usr.bin/ztest/Makefile | 2 -- cddl/usr.libexec/zfs_prepare_disk/Makefile | 2 -- cddl/usr.libexec/zpool_influxdb/Makefile | 2 -- cddl/usr.sbin/zdb/Makefile | 2 -- cddl/usr.sbin/zhack/Makefile | 2 -- share/mk/src.sys.mk | 3 +++ 13 files changed, 3 insertions(+), 24 deletions(-) diff --git a/cddl/lib/libtpool/tests/Makefile b/cddl/lib/libtpool/tests/Makefile index 19e43cc18821..72a82b6afa59 100644 --- 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 index 031cc27fb431..57d9fb16e7ab 100644 --- 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 index 9a0a5198602e..3b9abe4446e8 100644 --- 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 index ab7b852b4d9a..be498d730011 100644 --- 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 index 6d3663081ae6..4bc8da774168 100644 --- 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 index fd8437ed3f2c..2305c36ccbab 100644 --- 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 index 7b753f79c4d7..09f4b81025c9 100644 --- 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 index ef4bd561b41a..755764493ddf 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -1,7 +1,5 @@ .include -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 index 0d3f9b56b28c..1a261c5684bc 100644 --- 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 index f91ce1a7a213..53779443573d 100644 --- 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 index f8f7eea6050b..2e8f88603645 100644 --- 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 index 2b981919e17b..0d83856eb080 100644 --- 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 index ec035fb71e54..6d6523f24754 100644 --- a/share/mk/src.sys.mk +++ b/share/mk/src.sys.mk @@ -48,6 +48,9 @@ CFLAGS+= -fmacro-prefix-map=${SRCTOP}=/usr/src -fdebug-prefix-map=${SRCTOP}=/usr 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"