From nobody Fri Sep 12 21:04:53 2025 X-Original-To: dev-commits-src-main@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 4cNn4P39lBz66W45; Fri, 12 Sep 2025 21:04: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cNn4P2ds5z3WPJ; Fri, 12 Sep 2025 21:04:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757711093; 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=e3H5kgN1OIwslvVuffIlcgWO+D6XVzpLxkJI9Y8PZsk=; b=PK+kdJ9n8eUtfqPQOuXAJ0Z20wpOnL9jl7pk45LXbTHs0r789e9meWt/XSu52LJgTkeKo/ RzFFXmKryFTwhy1ns0Qh45AeU3UnvLJGGzKkdQ3CE+L00USECS3wcWGIXinneGRaw79E0w bv2zOH18UY69+xqGCsDbDeLssLatlKcKnQNqycBV9vaB4aTw2pLeQ8GowSuRiEdnRfamGN M/vKxaO/kB5QgXSWM++v7XQB0Ukhvnr795lmGQ0d+8sp+af8mUHaTl9W+Ct8oSKan0dFQl dxKlrK1ggGUB2gCXcQlPugcK/dkpIWtJELgPOyjZSV9GwofPNHnZU7imo7X54w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757711093; 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=e3H5kgN1OIwslvVuffIlcgWO+D6XVzpLxkJI9Y8PZsk=; b=KrUo46qJHZoop1D119qcVaGDtUoHF/1PJt2gdrVLOcPA1GPjeamcfdWFYQyVBwsHLhvWiq e7yMJRQ8o47LQy5jBRbSXYtVNy84F9X0RvAxRXs7E79C9/F8FAJ6/ay5I9p/qyewLuaU+I hpVIwINvsaPE3Pdz1K37LhbVdlKfU0h8g3h30QfAUENHntHm/XAUTIJ18Z8Tk8eUOJ9NYi igqV2cekIXc69KXGFhOtc82aJRDieqX7SoVpoW6BlrUHN698t9pLH2hao7qEn9k0klTbCe 8Bh7A9g9VCwskpcpj9Ts7vV535mGf1h1g3b8LOsl3UNEXUJoQ13CnDXyZOthNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757711093; a=rsa-sha256; cv=none; b=VucK7u2ReYEgXE75r5VCsBSdwA+VeZ4TtyI9OhmQggHERANjPvMIQj13gw/PkCV64xQ1Rq NVLYxNbAQjpa/S/6ahE1UrzrWagea8ifqVBdeXi8OErdrsUIEqM1xtbFBgd0pHF15nUUXu vj6JGUO8zxLFI10soABDAxK8L/y4PSLCowJuEuN3zVuC4OeQS+EcVUx2qr5wJJWKkdGDXr 109/AnkFkOuXCjPuq0Ks4PUwWZzyuuxOzG+GGOW8fcygLGFKBleEgmby1QFhNStS1mbzjd AMhpn+qM35E0+tPw5Oc45/OWwlVU/cuS47SyChr8r+sGefJg4TGd3QKizrJdqw== 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 4cNn4P24wyz18CV; Fri, 12 Sep 2025 21:04:53 +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 58CL4rH5045234; Fri, 12 Sep 2025 21:04:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58CL4rdP045231; Fri, 12 Sep 2025 21:04:53 GMT (envelope-from git) Date: Fri, 12 Sep 2025 21:04:53 GMT Message-Id: <202509122104.58CL4rdP045231@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: 29185c9a2620 - main - packages: Use LIB_PACKAGE for zfs and ufs packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 29185c9a26204383270cf96957c685c51f5bc894 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=29185c9a26204383270cf96957c685c51f5bc894 commit 29185c9a26204383270cf96957c685c51f5bc894 Author: Lexi Winter AuthorDate: 2025-09-11 19:46:26 +0000 Commit: Lexi Winter CommitDate: 2025-09-12 20:56:51 +0000 packages: Use LIB_PACKAGE for zfs and ufs packages Commit f9513c334ff7 moved the shared libraries for ZFS and UFS into separate packages (libzfs and libufs), which resulted in a rather large number of packages being created, e.g. for ZFS: FreeBSD-libzfs FreeBSD-libzfs-dbg FreeBSD-libzfs-dbg-lib32 FreeBSD-libzfs-dev FreeBSD-libzfs-dev-lib32 FreeBSD-libzfs-lib32 FreeBSD-zfs FreeBSD-zfs-dbg FreeBSD-zfs-dbg-lib32 FreeBSD-zfs-dev FreeBSD-zfs-dev-lib32 FreeBSD-zfs-lib32 FreeBSD-zfs-man Use LIB_PACKAGE instead, which significantly reduces the number of packages: FreeBSD-zfs FreeBSD-zfs-dbg FreeBSD-zfs-dbg-lib32 FreeBSD-zfs-dev FreeBSD-zfs-dev-lib32 FreeBSD-zfs-lib FreeBSD-zfs-lib32 FreeBSD-zfs-man MFC after: 3 days Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D52416 --- cddl/lib/libavl/Makefile | 4 +++- cddl/lib/libicp/Makefile | 2 ++ cddl/lib/libnvpair/Makefile | 4 +++- cddl/lib/libspl/Makefile | 4 +++- cddl/lib/libtpool/Makefile | 7 ++++--- cddl/lib/libumem/Makefile | 4 +++- cddl/lib/libuutil/Makefile | 4 +++- cddl/lib/libzdb/Makefile | 4 +++- cddl/lib/libzfs/Makefile | 4 +++- cddl/lib/libzfs_core/Makefile | 3 ++- cddl/lib/libzfsbootenv/Makefile | 2 ++ cddl/lib/libzpool/Makefile | 2 ++ cddl/lib/libzutil/Makefile | 4 +++- lib/libbe/Makefile | 1 + lib/libufs/Makefile | 4 +++- release/packages/ucl/libufs-all.ucl | 8 -------- release/packages/ucl/libzfs-all.ucl | 5 ----- 17 files changed, 40 insertions(+), 26 deletions(-) diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index ce77012def9f..4ce1de20a3d9 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -1,6 +1,8 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl -PACKAGE= libzfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= avl LIBADD= spl SRCS= avl.c diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 8e801246215f..1a9a79103b50 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -1,6 +1,8 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp PACKAGE= zfs +LIB_PACKAGE= + LIB= icp LIBADD= diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index 2d9ef1c7af1e..8245b324688b 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -2,10 +2,12 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair .PATH: ${SRCTOP}/sys/contrib/openzfs/include +PACKAGE= zfs +LIB_PACKAGE= + LIB= nvpair LIBADD= spl -PACKAGE= libzfs # user INCS= libnvpair.h SRCS= libnvpair.c \ diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index d8d997c6f377..26e14ea72b8a 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -4,9 +4,11 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl .PATH: ${SRCTOP}/sys/contrib/openzfs/include +PACKAGE= zfs +LIB_PACKAGE= + LIB= spl LIBADD= -PACKAGE= libzfs SRCS = \ assert.c \ diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile index 7acf34219a47..3a50a21bf62c 100644 --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -1,11 +1,12 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool .PATH: ${SRCTOP}/sys/contrib/openzfs/include +PACKAGE= zfs +LIB_PACKAGE= -LIB= tpool +LIB= tpool SHLIBDIR?= /lib -LIBADD= spl -PACKAGE= libzfs +LIBADD= spl INCS= thread_pool_impl.h SRCS= thread_pool.c diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile index 9164ba771fe6..512332275fec 100644 --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -1,6 +1,8 @@ .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem -PACKAGE= libzfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= umem SRCS= umem.c WARNS?= 3 diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 8c8a786ee039..947e755d4aae 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -1,6 +1,8 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil -PACKAGE= libzfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= uutil SRCS=\ uu_alloc.c \ diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile index 0eb30c55d107..040d7d2c63f9 100644 --- a/cddl/lib/libzdb/Makefile +++ b/cddl/lib/libzdb/Makefile @@ -1,8 +1,10 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb .PATH: ${SRCTOP}/sys/contrib/openzfs/include -LIB= zdb PACKAGE= zfs +LIB_PACKAGE= + +LIB= zdb INCS = libzdb.h diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index 40553aa68719..376e32fb893f 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -7,7 +7,9 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib -PACKAGE= libzfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= zfs LIBADD= \ avl \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index bac81ca73497..10533c5de05b 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -3,10 +3,11 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs +PACKAGE= zfs +LIB_PACKAGE= LIB= zfs_core LIBADD= nvpair spl zutil -PACKAGE= libzfs INCS= libzfs_core.h SRCS= libzfs_core.c \ diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile index 15ee5bfaeaa4..22f5da1ee5b1 100644 --- a/cddl/lib/libzfsbootenv/Makefile +++ b/cddl/lib/libzfsbootenv/Makefile @@ -2,6 +2,8 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/include PACKAGE= zfs +LIB_PACKAGE= + LIB= zfsbootenv SHLIB_MAJOR= 1 diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 4da3840e59f0..82ec0e890d56 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -29,6 +29,8 @@ PICFLAG= -fPIC .endif PACKAGE= zfs +LIB_PACKAGE= + LIB= zpool USER_C = \ diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile index 07ca3b9bc156..37e9e8dd5e63 100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -2,9 +2,11 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs +PACKAGE= zfs +LIB_PACKAGE= + LIB= zutil LIBADD= avl geom m tpool -PACKAGE= libzfs INCS = zutil_import.h diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile index b04becc38d74..3ba456aee4b7 100644 --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -3,6 +3,7 @@ SHLIBDIR?= /lib .include PACKAGE= zfs +LIB_PACKAGE= LIB= be SHLIB_MAJOR= 1 SHLIB_MINOR= 0 diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile index ab913f834bb3..3b1911d7a5cd 100644 --- a/lib/libufs/Makefile +++ b/lib/libufs/Makefile @@ -1,4 +1,6 @@ -PACKAGE= libufs +PACKAGE= ufs +LIB_PACKAGE= + LIB= ufs SHLIBDIR?= /lib SHLIB_MAJOR= 8 diff --git a/release/packages/ucl/libufs-all.ucl b/release/packages/ucl/libufs-all.ucl deleted file mode 100644 index d86a84bbd637..000000000000 --- a/release/packages/ucl/libufs-all.ucl +++ /dev/null @@ -1,8 +0,0 @@ -comment = "Low-level access to UFS filesystems" -desc = <