From nobody Tue Jun 23 15:56:53 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 4gl8nx6sJxz6hdyV for ; Tue, 23 Jun 2026 15:56:53 +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 4gl8nx4Nr1z3Hmc for ; Tue, 23 Jun 2026 15:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782230213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/RY/5c1VEUePzGG4HUKMQmHj4yjd7B8HwICgfAv7v0=; b=Mmw62QRePWM5DkuqZOzH3+e7QN+9HSjwdzwcnL031O9j/ouy33KDanyFYSji2szkj1iaJ9 DF+Ir+fVBmxrhrBh2+rLpgQTQ6qM6QsS19uqtKYWl86UGGbvX71zbsrey7LW2O9NY7l5EY N/maNVUM2t8S4r5lHnuzXAHp5Y2ZMfvH7Wi5IPoq0FvGDj1XjPD2n8fiKU1o7okvgyU5eA X7HnQQ0OZRt90cJ2A5dE5rbsUr3gpq9uwJ+m/tf0qHyDC4H1JH6JM3qzUumK3DK+PoRt7G TAW9TV9RY5I4U1TCJyYwHlJ4ol0kCCPaciBzJ0PTzc8RKxNmkXi8Sv6/A5HohQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782230213; a=rsa-sha256; cv=none; b=XCsx7BHWibaJn3gO4N7fGW4oQ9dRbEpzZL4yFZha8gM/gai+URuCX/zDSgC2oInl9RMicU RnRwlQSZ9ko0saV4SdFdUhaIh2BJZCkoh3vKzot3/VLcyrMVkvQEGw3+Maqa3OfuD1NgKh nW5pWyM+kv5tS+GbXFOPKvw54yJYZ2c7bQ8/dZ2eRUV5/5v43PAWveDjwnLkKs4f1kUfCc KaWai/ZBUJPb9K9/WZIh+ginuOaOQPJpa5opPnfmh0AI4Tm9i2hyK1rp6TBEH/2rMEdI1x G2cjsHxVOfc3b6huel069DA1H7kgoJNefm332gyD426RqPOinhdU58aRB1rM+Q== 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=1782230213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/RY/5c1VEUePzGG4HUKMQmHj4yjd7B8HwICgfAv7v0=; b=aJfo4wtyG7sD+9mS3PSWzlctkl1zraflGeE0UNZN9OGmyazFTpyofASSspcSKPLXUlkIb/ 4gvqemL6xl2Z0FL1d8TYFroi3gnJ7obAvfGILEAKvpWpo99YIfPDOPVCWx3ZyHOSoVAqUW MDPyol907SnUleXhg9zgxjZSFFL89tocP+ji/aud35MfubP7hL6Jwc5RlYFEuDUWl/MZjh Yz6v04GL2sgpZ19CxWg5BzehmNHE423WWwvzO89U9xVAKXWzccNWMbgyCJnbs9Zp/xHAOr QI/Q2UoYTB9rHZkMTt3gNmn3xt4NbVDkczm3WQshEvsB0p3tQ5Cp73ACRmxTTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl8nx33hSzgc2 for ; Tue, 23 Jun 2026 15:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 21f72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 15:56:53 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Warner Losh From: John Baldwin Subject: git: b98ac603e47a - stable/15 - stand: Move from OZFS to 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: b98ac603e47a5cef1880db8a61a6875e13592e86 Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 15:56:53 +0000 Message-Id: <6a3aacc5.21f72.5d99de27@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b98ac603e47a5cef1880db8a61a6875e13592e86 commit b98ac603e47a5cef1880db8a61a6875e13592e86 Author: Warner Losh AuthorDate: 2025-11-25 00:35:19 +0000 Commit: John Baldwin CommitDate: 2026-06-23 15:29:26 +0000 stand: Move from OZFS to ZFSTOP Use ZFSTOP instead of OZFS. They are the saame thing. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D53900 (cherry picked from commit 05346243dfa4ed85c4c3a31f2a32a861fd649c07) --- stand/defs.mk | 5 ++--- stand/libsa/zfs/Makefile.inc | 16 ++++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/stand/defs.mk b/stand/defs.mk index 2cf1893a6159..469c95c9dbb9 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -59,9 +59,8 @@ SASRC= ${BOOTSRC}/libsa SYSDIR= ${SRCTOP}/sys UBOOTSRC= ${BOOTSRC}/uboot ZFSSRC= ${SASRC}/zfs -OZFS= ${SRCTOP}/sys/contrib/openzfs -ZFSOSSRC= ${OZFS}/module/os/freebsd/ -ZFSOSINC= ${OZFS}/include/os/freebsd +ZFSOSSRC= ${ZFSTOP}/module/os/freebsd/ +ZFSOSINC= ${ZFSTOP}/include/os/freebsd LIBCSRC= ${SRCTOP}/lib/libc BOOTOBJ= ${OBJTOP}/stand diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 2e9d5679f71f..5ecf68d3bc09 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -1,12 +1,12 @@ .PATH: ${ZFSSRC} .PATH: ${SYSDIR}/crypto/skein .PATH: ${ZFSOSSRC}/spl -.PATH: ${OZFS}/module/zstd -.PATH: ${OZFS}/module/zstd/lib/common -.PATH: ${OZFS}/module/zstd/lib/compress -.PATH: ${OZFS}/module/zstd/lib/decompress -.PATH: ${OZFS}/module/icp/asm-aarch64/blake3 -.PATH: ${OZFS}/module/icp/algs/blake3 +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib/common +.PATH: ${ZFSTOP}/module/zstd/lib/compress +.PATH: ${ZFSTOP}/module/zstd/lib/decompress +.PATH: ${ZFSTOP}/module/icp/asm-aarch64/blake3 +.PATH: ${ZFSTOP}/module/icp/algs/blake3 ZFS_SRC= zfs.c nvlist.c skein.c skein_block.c list.c ZFS_SRC+= zfs_zstd.c ZFS_SRC+= blake3.c blake3_generic.c blake3_impl.c @@ -41,7 +41,7 @@ ZFS_EARLY= -I${ZFSSRC}/spl \ # from FreeBSD. # .for i in ${ZFS_SRC} ${ZSTD_SRC} -CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${OZFS}/include \ +CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h -Wformat -Wall -I${ZFSTOP}/include \ -DNEED_SOLARIS_BOOLEAN .endfor @@ -76,7 +76,7 @@ CFLAGS.$i+= -U__BMI__ ${NO_WBITWISE_INSTEAD_OF_LOGICAL} CFLAGS.zfs_zstd.c+= -DIN_BASE -DIN_LIBSA -CFLAGS.blake3_impl.c+= -I${OZFS}/module/icp/algs/blake3 -I${OZFS}/module/icp/include -DIN_LIBSA +CFLAGS.blake3_impl.c+= -I${ZFSTOP}/module/icp/algs/blake3 -I${ZFSTOP}/module/icp/include -DIN_LIBSA # Do not unroll skein loops, reduce code size CFLAGS.skein_block.c+= -DSKEIN_LOOP=111