From nobody Fri Jul 8 17:49:58 2022 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 DF54D12AFE52; Fri, 8 Jul 2022 17:49:58 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lfglp5wK5z4881; Fri, 8 Jul 2022 17:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302598; 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=2zNEmjbnQV2Mpa+vV2jrjm8gCFdvMuJgrVJNhG7w8I0=; b=leyAXhmmNKIcRJLSjdLLPDBIGtThMEJ3OODKE63X8B1aES/hBSpbyAS7MhI3pB+eZaazcC U6Pze7ylT6y1w/T83ldtkAzqW+JSxeyc2O5urIVrkShFR/oGs4VjfvPdE0iwd5zU6JI7np 4iQpCX5eqCPZGCxKxkgxMKHjhAdf3FB8s0N2eNHnue6oiUpuhpRlp8NMmh4Y+sLB3jGF10 22m2YgImXKhlcmy+o09ki7xs55w0PyU/uoI+MDyoLP/nFz3NydwgJI0DhcTP40WR56O20X SpMJFoTtaXZKU1340lsBrlUbcCihcnqTbkxBGJuJepuCbNay8mOu0arn/mhOvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lfglp4xkTzFnc; Fri, 8 Jul 2022 17:49:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 268HnwMO064357; Fri, 8 Jul 2022 17:49:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268Hnwl7064356; Fri, 8 Jul 2022 17:49:58 GMT (envelope-from git) Date: Fri, 8 Jul 2022 17:49:58 GMT Message-Id: <202207081749.268Hnwl7064356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f424b167a317 - main - stand: Don't reuse ZFSSRC 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: f424b167a317b37ba7626e11002ca00dcc03f661 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302598; 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=2zNEmjbnQV2Mpa+vV2jrjm8gCFdvMuJgrVJNhG7w8I0=; b=ZxJV0pq2qKVHIum09koOaFGSzTwKZJX7HuShmaDd1Cscr32iKeJJAE/NAxJqeXNY5y3mjC FP83fvELkbPmQkFLADsq+ivGeV586Wslr1fkZVV80WFljdNYyWpE+kuLONkG4SwqcQYMY/ y+QJaDvVCWCqTyumt7tGBrok7Wx4rLSbopJfjbzUrxCLlFkVM9fkhILiWLGK81wY2oI9pS oKEyYys80P/UNyL4pg8UVbz+tHwOtWzZHlmnz3Sw7iOLgUNOIZKjxRnxZBSF65lKaK/Etl Z5NFR1AMhZlvLxl0Z1So9b40hspFBM3FftcKEXQ2gqWCAF9J11j/Ut2hmFvwoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657302598; a=rsa-sha256; cv=none; b=U3obP6yEnTtqkuqysd8Po+Imzt5deuuc26nfosrX3DwOic0P6F2sOo1orQUuK3XxfyeYPw EUj8cHnxlV3ts5t2XXrNoC6NMjbKLm3n7mp8ct7Su8wUqICmlP2rbo2RRrUwtURWiQdPtH CNzMn7kU9tUcZ+vkUTGpHXpGlVxV2yC/v8LreZ3/fqC7ms9+kYkdO835g3Fi3vmLdK6ylL Oeq9GP7/sywYI8Lo2GuDxcmKCrO2aCwbBa5ZoOrQVrvQEfq843CC4Qxj9Tw6nz/cEUbP6c dLYgUkLO/kYJlIB2U9ao3dV1MkicnUGGzNCb3c83cNFbVb0AYKaRDW0lBQk0JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f424b167a317b37ba7626e11002ca00dcc03f661 commit f424b167a317b37ba7626e11002ca00dcc03f661 Author: Warner Losh AuthorDate: 2022-07-08 15:03:45 +0000 Commit: Warner Losh CommitDate: 2022-07-08 17:47:36 +0000 stand: Don't reuse ZFSSRC ZFSSRC is the top level directory where the ZFS sources come from. Don't reuse it for a list of ZFS sources. Instead, use ZFS_SRC Sponsored by: Netflix --- stand/libsa/zfs/Makefile.inc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 2a06db0d2f5d..d63e1582d2a3 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -6,19 +6,19 @@ .PATH: ${OZFS}/module/zstd/lib/common .PATH: ${OZFS}/module/zstd/lib/compress .PATH: ${OZFS}/module/zstd/lib/decompress -ZFSSRC= zfs.c nvlist.c skein.c skein_block.c list.c -ZFSSRC+= zstd_shim.c -ZFSSRC+= entropy_common.c error_private.c -ZFSSRC+= fse_compress.c fse_decompress.c hist.c -ZFSSRC+= huf_compress.c huf_decompress.c pool.c xxhash.c -ZFSSRC+= zstd_common.c zstd_compress.c zstd_compress_literals.c -ZFSSRC+= zstd_compress_sequences.c zstd_compress_superblock.c -ZFSSRC+= zstd_ddict.c zstd_decompress.c zstd_decompress_block.c -ZFSSRC+= zstd_double_fast.c zstd_fast.c zstd_lazy.c zstd_ldm.c -ZFSSRC+= zstd_opt.c +ZFS_SRC= zfs.c nvlist.c skein.c skein_block.c list.c +ZFS_SRC+= zstd_shim.c +ZFS_SRC+= entropy_common.c error_private.c +ZFS_SRC+= fse_compress.c fse_decompress.c hist.c +ZFS_SRC+= huf_compress.c huf_decompress.c pool.c xxhash.c +ZFS_SRC+= zstd_common.c zstd_compress.c zstd_compress_literals.c +ZFS_SRC+= zstd_compress_sequences.c zstd_compress_superblock.c +ZFS_SRC+= zstd_ddict.c zstd_decompress.c zstd_decompress_block.c +ZFS_SRC+= zstd_double_fast.c zstd_fast.c zstd_lazy.c zstd_ldm.c +ZFS_SRC+= zstd_opt.c CFLAGS+= -DHAS_ZSTD_ZFS -SRCS+= ${ZFSSRC} +SRCS+= ${ZFS_SRC} CFLAGS+= -I${LDRSRC} CFLAGS+= -I${SYSDIR}/cddl/boot/zfs @@ -28,7 +28,7 @@ ZFS_EARLY= -I${ZFSOSINC} \ -I${ZFSOSINC}/spl \ -I${ZFSOSINC}/zfs -.for i in ${ZFSSRC} +.for i in ${ZFS_SRC} CFLAGS.$i+= -include ${ZFSOSINC}/spl/sys/ccompile.h .endfor