From nobody Tue Jun 23 15:56:51 2026 X-Original-To: dev-commits-src-branches@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 4gl8nv3d92z6hf8d for ; Tue, 23 Jun 2026 15:56:51 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl8nv33mqz3HR2 for ; Tue, 23 Jun 2026 15:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230211; 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=Y1ivz6JKeL79Fw+kA21uTSboNUpiZziN9UVCfwIqoS0=; b=ZaHKyP2hMHtfnHPrOaRBQe+clFmgBePpz5gmVD6eWAhpxXLl0gdCDK4GYmDX56hhWvfC84 5Gh006KntXC1JirSMxsROK0AEGgP/i43llfHdvBA8CSyqiMwTu2YAYRitRKkdPQ4iyRy8R nHn24dFbBQF46XJ1xTagaLZ6+e4Qrr+9jSr0UtPiBEdfgBloLJxNf8QjfDxHHFR3/O7I9r grsaBeqTPgDVLRy2xmVauf8VrGh8p/fvgMIrhg7ehdwyttF71DXqGCiL5PQC48dF31q6hE Wbp9dQCI6qNaEar8xzLzVDWDLeEg8boTsbC8V1qXAL+cpXIxF1WvPhkFxp0VzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782230211; a=rsa-sha256; cv=none; b=u7tCyonUSVCgyVo2aUuyZIswnXNPgweLRlkUvrVikiYccSpChh+ww2SuXoE7DLgoxOxodM /TM7TO7vpDqaqfkwxTECkJaQzFmQp5aMfab1ZIidKstFU3uQd1TlopMQ7asCyqYaBnE5Mv JfR8eGBsRwamkow2/8n9aFGOqgzANbWZLYq8r/cFQ7o4ZBc6Ns+G6a/KZXRaqsTvhbvdeh U3H4xAppaCInZfhKHZunIfnrK522psfjDq9xEQ/IcRYRCVYMa6K4C79GN48bgDsoKGJocY oHEJz8McN5SsCd5hUg4OxOlKG0hLUaKEx8D+AsDDRBYcuDpx0g91IIetXlK+Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230211; 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=Y1ivz6JKeL79Fw+kA21uTSboNUpiZziN9UVCfwIqoS0=; b=qPhlylmJ8AEMjrs1SNVJsEr1hGJHQCjRfYo6B5nD0ZCiNHxutFAPoE5I2BRzfSZ3X8Ygp6 Ve/6ecz1dIhyzFP6CCzCOMAUsljNiIAbQ5OK3EX4V7DjBakVNtvpuiHs4Yo8Ic1vilXN59 5FcUFp5Rw3PjCdC8lexCKoS/1CHA134SfaeIo8M/Li8a3+/S7JVx+2eYEDWB8VwNUlCuOy gq59JTWlozcqmoSASMnOknlZCo5837oFArVRAOrm3R/Pyygn9ULY4rPfyix4X0ImY1LQNU 3tRP1OqI3v/HiPXmKgYmQ0IY92VGWxz4J3YJUIcW5FuoFWEfFfRDp7BxTBxvHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl8nv1vDQzgYX for ; Tue, 23 Jun 2026 15:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21764 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:56:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 49c7ac23fa1d - stable/15 - Centralize definition of ZFSTOP List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 49c7ac23fa1dd4c883bc91bae4a854deff0cba54 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:56:51 +0000 Message-Id: <6a3aacc3.21764.5efdf54d@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=49c7ac23fa1dd4c883bc91bae4a854deff0cba54 commit 49c7ac23fa1dd4c883bc91bae4a854deff0cba54 Author: John Baldwin AuthorDate: 2025-11-24 15:46:56 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:20:55 +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 (cherry picked from commit 7980cf5d6f71adef3ca38825f4aa8aa38a59e43c) --- 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 407159a85255..c4b9b31602f5 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 921d4df7a651..6db4bf6a53cd 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 b131901cb6a9..b9c45c25923e 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 cb51b5110f03..dc80100ddcac 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 064ac9b23e4a..3c271997fb3b 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 ad6e63f428a3..13d98b60d1fb 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 69d561b3407b..a11abd6efe9d 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"