From nobody Mon May 05 15:39:48 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 4Zrm1K4bpWz5vgFp; Mon, 05 May 2025 15:39:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zrm1J6Fwkz43FC; Mon, 05 May 2025 15:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746459588; 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=eK9PftXLZRB+45kQGd+Utk8ksc8ip/IsmbvSJPSM6a8=; b=GQ4DowI3Y3TPNYAv5LV5luCQd14a0t6TEUX2DNrf7sQfYA1smh2L4OA09iA+ZU/AHRrBfM EX10UCZKDyb4w/PbNwOSBPQfieGVHCZjWJw6AL63rWpp7wqV2aMfa1Bkurq64+6WBJJvlk N3V6sbqCZsg9QJW91B1epOkuw+c/tXWO5jBHq5nq5w9CqV1bm7KFGrXKtH4386cWx3UMij 3AtTu1SYECu+uiUZU0/5bJysr7TMniEoJMIbcUDGX5t1NE5BcmTZl2m/08PPOFC6ma2vMn Qlo90QLEmdcRRPjufILwNFY+JCe4uD9LmiQxEOernHPakssyhV1mo80pSz6Aow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746459588; 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=eK9PftXLZRB+45kQGd+Utk8ksc8ip/IsmbvSJPSM6a8=; b=Fmfk+Z5M/+WXKblh0vT9Bk4yvHqnw+bgnTWQQQ+b4m9T3bMKrAinWIri+JbDgA9TXgmbEb 5RnMZLs8e++Ccyv0xahpGHnM4mPb2SET5UsLmzEOuKQ1091jpVXf3x1AW2WarKvI8nVYiX oreWEE5Z5075nin3xFkvMBy8c8ZfYCDfv/c03unuww0nxggPg1CKRVH7+kQHpfQw/oXhd/ KMketrsSxV2MbXILpy3pm+cIHVswRYpunHMfxvqNsI1J6jWV7MmM2jxzcFUKKvzZzO6TLq HkzQWYx/aiOeDoqJK+ZoYBp+XieN5swJ7j/vjhOg/GzqMPRw2B8xruLtNFPjLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746459588; a=rsa-sha256; cv=none; b=LkPamHmOSwpwAU+iNW++7MNuU0aGp+ess3X4ZuEM3Q9uQWISiRQmaew4wgckoeNRqfEzYT bj5F2DVA1N8TM01PuxG9ZO5QsM6mh4Bi0sqKkuKOSspJ+DfjQ6OiZhi6jIEfArpIb5CHBW LuYFdzzwCoQ2DZ3BTUmth1v2QmJnbd/kJtKq9/sTAOrX/+HHh04TrZDZinJ2ixPZulTm76 GRd8IKkhrY+2G8jVKe4cfD3h16aRv2pTTU7zlqmMJKWFSL1hgJumRWnXl5i6F+4ftqyBOs 4polxU5MSxF2NiolT2I7btShccyJcRxwyBDOeFcKB6i0KGr/PL9gscrlx5x5ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zrm1J4Fg5z4Kp; Mon, 05 May 2025 15:39:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 545FdmZc097439; Mon, 5 May 2025 15:39:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545FdmxC097437; Mon, 5 May 2025 15:39:48 GMT (envelope-from git) Date: Mon, 5 May 2025 15:39:48 GMT Message-Id: <202505051539.545FdmxC097437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: f9513c334ff7 - main - add packages for libufs, libzfs 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9513c334ff7d3ccdebfcb90f015890963768e0d Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f9513c334ff7d3ccdebfcb90f015890963768e0d commit f9513c334ff7d3ccdebfcb90f015890963768e0d Author: Lexi Winter AuthorDate: 2025-05-05 15:23:54 +0000 Commit: Lexi Winter CommitDate: 2025-05-05 15:39:25 +0000 add packages for libufs, libzfs currently FreeBSD-utilities depends on both FreeBSD-ufs and FreeBSD-zfs. this is not desirable, because those are both relatively large packages and the user may want to remove one or the other – or perhaps both, e.g. in a jail or embedded system. the reason for this dependency is that fstyp(8), which is in FreeBSD-utilities, links both libufs and libzfs. FreeBSD-utilities is the correct place for fstyp, so we don't want to move that. instead, add two new packages: libufs contains libufs, and libzfs contains libzfs plus the ZFS libraries it depends on: libavl, libnvpair, libspl, libtpool, libumem, libuutil, libzfs_core and libzutil. with this change, it is possible to remove FreeBSD-ufs and/or FreeBSD-zfs while leaving FreeBSD-libufs, FreeBSD-libzfs and FreeBSD-utilities installed. Reviewed by: manu, des Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50148 --- cddl/lib/libavl/Makefile | 2 +- cddl/lib/libnvpair/Makefile | 2 +- cddl/lib/libspl/Makefile | 2 +- cddl/lib/libtpool/Makefile | 2 +- cddl/lib/libumem/Makefile | 2 +- cddl/lib/libuutil/Makefile | 2 +- cddl/lib/libzfs/Makefile | 2 +- cddl/lib/libzfs_core/Makefile | 2 +- cddl/lib/libzutil/Makefile | 2 +- lib/libufs/Makefile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index c816f07df223..ce77012def9f 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl -PACKAGE= zfs +PACKAGE= libzfs LIB= avl LIBADD= spl SRCS= avl.c diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 9ae081b7a96e..2d9ef1c7af1e 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -5,7 +5,7 @@ LIB= nvpair LIBADD= spl -PACKAGE= zfs +PACKAGE= libzfs # user INCS= libnvpair.h SRCS= libnvpair.c \ diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index efeba68e4f03..d44e5cb19ab4 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -6,7 +6,7 @@ LIB= spl LIBADD= -PACKAGE= zfs +PACKAGE= libzfs SRCS = \ assert.c \ diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile index 94b29c9ae72d..2afaf0c417e9 100644 --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -4,7 +4,7 @@ LIB= tpool LIBADD= spl -PACKAGE= zfs +PACKAGE= libzfs INCS= thread_pool_impl.h SRCS= thread_pool.c diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile index f955e306c62c..9164ba771fe6 100644 --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem -PACKAGE= zfs +PACKAGE= libzfs LIB= umem SRCS= umem.c WARNS?= 3 diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 547078504103..8c8a786ee039 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -1,6 +1,6 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil -PACKAGE= zfs +PACKAGE= libzfs LIB= uutil SRCS=\ uu_alloc.c \ diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index bb0127a9108a..40553aa68719 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -7,7 +7,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib -PACKAGE= zfs +PACKAGE= libzfs LIB= zfs LIBADD= \ avl \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index d986c45725b3..8ce0a152852f 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -6,7 +6,7 @@ LIB= zfs_core LIBADD= nvpair spl zutil -PACKAGE= zfs +PACKAGE= libzfs INCS= libzfs_core.h SRCS= libzfs_core.c \ diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile index d1a943b25005..07ca3b9bc156 100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -4,7 +4,7 @@ LIB= zutil LIBADD= avl geom m tpool -PACKAGE= zfs +PACKAGE= libzfs INCS = zutil_import.h diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile index 12c742e6b871..ab913f834bb3 100644 --- a/lib/libufs/Makefile +++ b/lib/libufs/Makefile @@ -1,4 +1,4 @@ -PACKAGE= ufs +PACKAGE= libufs LIB= ufs SHLIBDIR?= /lib SHLIB_MAJOR= 8