From nobody Tue Nov 25 03:08:06 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 4dFngp5Hyyz6HM32 for ; Tue, 25 Nov 2025 03:08:06 +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 4dFngp4nwtz3RG2 for ; Tue, 25 Nov 2025 03:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764040086; 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=4XdLwulCDlyhGt9MeIx2xGYgSWD7zht5bDcDNQ6cUKE=; b=euuJKSQVPMdtTwwckxTtGvgxFo2XSNYwMOguA1gimfnsvXl7FnW8ENNa5g/QoE3i0d1d9M mCs6r9YVGKZDxI1fcnadksuW1aABX9D1dMLpHWAoahvqA5QpmWvLFs5y22lC6pV4iND+Qf vzwlLw0rLX4wT8KHTi/DQ5EeRiK8wS7Vsu0Quv88yO8rIa2spmIemjpLBGmuXX4O6E4ZA/ ADHE1TEEK4hEnQLT3weKhBqd2G/jVaxnYLcJpbZC4K0j210xZnfpghHwV2TLbjXKv4qZJd ZjP1OEta3hnw8gvU1SsX4fNWr1hyugqJ6A11ooFIceYKNruJkquTNIm+iUWJbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764040086; 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=4XdLwulCDlyhGt9MeIx2xGYgSWD7zht5bDcDNQ6cUKE=; b=hsB/bnSVeBhYpn6J/Gyf05OapMeFgGYYS9eU7kASL6Vxq8VfcIuteeMmOa6jEFwG33RLRY RMQUFbq8rgW1hlIpj3WFEoEI+IVMcZALfh6nE0GYxVf0zNp0r7Y79K39HrraS3BtKTHSqQ 2E1GsFlvpAhi8j78anr0i068Vyr/fpaOTibEaI6V7qRAHbs+LVhdJb7pgmWhO3h4oi+m3D /TbNW0JutgyWIjdQOozpjPjFMv7gnPiI+oXO+6pi4AxazYJ2J28IUfiv1bgOjeAnSkRi5A dp0cw6EDrDuulEYlOx1cPi2Z+l3AJRigaNoJbAeqJyZkWLL6BGSUj9UWztoRDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764040086; a=rsa-sha256; cv=none; b=GAVt8OuxOrLu93/mcpyRs/8KTEi0RYYM1GaCACz0giWxldKgRUQSBbuX43f4fCv0VdJGre nhO4pnP/1Za/UCh2lUptc87tzNkfF/kEerP1yEmz5ckfjkMgPbh9h4S6tMYvIGB9YvgUqg WfyxDfqgYamtsBOI3u3gnzSr4uwNcnvgROB76TY2oGEv741sQiB+EqjNeU4dqmQlEWLqJA Vd5pwOGGu8g5TiIZiorYBSs5aIPeazQSGS4hm5XffbEISItiGg0nuCkvPlTteg7kDJxun0 CRZF1z6nbbqxJ6ORt+d/8g0C3G0YbrzvhfAi6BuOhty9Ataujgl8Wr5vu+Idkw== 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 4dFngp4L8YzjcY for ; Tue, 25 Nov 2025 03:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 31939 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 25 Nov 2025 03:08:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 05346243dfa4 - main - stand: Move from OZFS to 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05346243dfa4ed85c4c3a31f2a32a861fd649c07 Auto-Submitted: auto-generated Date: Tue, 25 Nov 2025 03:08:06 +0000 Message-Id: <69251d96.31939.23d143fd@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=05346243dfa4ed85c4c3a31f2a32a861fd649c07 commit 05346243dfa4ed85c4c3a31f2a32a861fd649c07 Author: Warner Losh AuthorDate: 2025-11-25 00:35:19 +0000 Commit: Warner Losh CommitDate: 2025-11-25 00:35:46 +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 --- 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 54149f5f7b9e..f6c43ef7bd01 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