From nobody Thu Feb 02 09:33:12 2023 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 4P6tr8593rz3cRyD; Thu, 2 Feb 2023 09:33:12 +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 4P6tr84Mhrz3mt0; Thu, 2 Feb 2023 09:33:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675330392; 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=13p7wN8RTmWsRefpiNnJu2MhIuyVkDjjORapMfPxWFw=; b=A+gADhTx9XdetaGcPjdyy4dsX+rbOWHoJrUQeIAl5yOK3ZVrk6htxU63Encu85sIfiQkYd X5yVGTZfq/GML1o4JbJfeP+hT6paoAn+RbBVazt/N07enSi6iwM5JyZsv0yQcdQZRXq6N+ 7KRs63SnFI4m+KiyJaFbtDz+FXaSb7UB4Ov0+PFh2GmxO+cMoOpF8iaG+BwPdPAngN0GEa 19z+fYMkmsDx+YZJnGjf8REL7LqJ2pqIKHX/EP9zTsjSo4sQ5j+FIdhYJ4XpOReZW2ZWGd 7nBeJqdiftsTDlCc0tjjbKzCN8lr/v2ZIYhCCJMshqdWJ4tvMJT5N7Z2xKllaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675330392; 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=13p7wN8RTmWsRefpiNnJu2MhIuyVkDjjORapMfPxWFw=; b=oP62iWCDxNcPbekzzf0xw/rOPi18W5gaLQpKsZq46Q/Xj4S0YMYR3b3oZZoCcv1Gn/z35e sK0JOF1lz0+tYzaVVqsLJ1ffANrW+j5l5c8Dq8Ayx3L+plHxx4RYviq8rkazqdznefK3fR NybB+d4A+/G3jlrKcPgnjdBUVg3qqP7Yru8Af+zgbmIbdnBwke3TqKtZTZyDcYektAHFYM PgU8FRUgwPRpxnNIMNI2GOBFCHEbmfHGmP6kUUOFa4U+yDL0gfnf4I0Qw/CuLFbDYNaxFr EQkJwptFUx4ErIGs2Jpd6ziWRXPP+gUgz+OnfXKpAM9z8uxSXmAyR/9MUbqfGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675330392; a=rsa-sha256; cv=none; b=PeJ1hJZY3lbelJEO9p2RcylIoEv1yUBFWiz6vbLqOsUymM3O+07juWUhuRwBUmZH1dsuah 17Ov0nzgEEgBg9RpLNjandghugz2Bim7GZQ+yDtwcOe8zMOcxby+Dt0aQVETekxcyp9+wz eOkU/DHYHH0OqKKF1V9UkWXE5NBg+wK5vSqYwdLQBgLoly53H5OJeKOYiaEs4vrg/QddAc v+nZYjbGGucOGPeiXJk1Ds2YlM9j0z8zYPSUXQxIPflJ5KAR/H7hhkPmzT3tsTMQQe96nU kvpmn9p6UTpIqFePnMw03kk3kv/3qF+tLg2wlIAuDsTgmJuqDMlmAyE3/D5elA== 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 4P6tr83RLWzqP7; Thu, 2 Feb 2023 09:33:12 +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 3129XC9w033899; Thu, 2 Feb 2023 09:33:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3129XCEb033898; Thu, 2 Feb 2023 09:33:12 GMT (envelope-from git) Date: Thu, 2 Feb 2023 09:33:12 GMT Message-Id: <202302020933.3129XCEb033898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 40b8a8f25302 - stable/13 - pkgbase: Put zfs utilities and lib in their own package 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 40b8a8f2530224ccebfd35b1875bc75f0ff72d79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=40b8a8f2530224ccebfd35b1875bc75f0ff72d79 commit 40b8a8f2530224ccebfd35b1875bc75f0ff72d79 Author: Emmanuel Vadot AuthorDate: 2022-07-22 08:43:39 +0000 Commit: Emmanuel Vadot CommitDate: 2023-02-02 09:32:55 +0000 pkgbase: Put zfs utilities and lib in their own package It is useful to have zfs utilities and lib in a separate package as it allow users to create image that can support ZFS (i.e. not with WITHOUT_ZFS in src.conf set) without bloating the default image with all zfs tools (for example for jails). Differential Revision: https://reviews.freebsd.org/D36225 (cherry picked from commit a71ea7bea0d2a8ba86373377c3c1443acbeab5d2) --- cddl/lib/libavl/Makefile | 2 +- cddl/lib/libicp/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/libzfsbootenv/Makefile | 2 +- cddl/lib/libzpool/Makefile | 1 + cddl/lib/libzutil/Makefile | 2 +- cddl/lib/pam_zfs_key/Makefile | 2 +- cddl/sbin/zfs/Makefile | 2 +- cddl/sbin/zpool/Makefile | 2 +- cddl/share/zfs/compatibility.d/Makefile | 2 ++ cddl/usr.bin/zinject/Makefile | 1 + cddl/usr.bin/zstream/Makefile | 1 + cddl/usr.bin/ztest/Makefile | 1 + cddl/usr.sbin/zdb/Makefile | 1 + cddl/usr.sbin/zfsd/Makefile | 1 + cddl/usr.sbin/zhack/Makefile | 1 + lib/libbe/Makefile | 2 +- release/packages/Makefile.package | 2 ++ sbin/bectl/Makefile | 2 +- 25 files changed, 27 insertions(+), 16 deletions(-) diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index b5e3b458f982..6a39e342bafc 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -2,7 +2,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl -PACKAGE= runtime +PACKAGE= zfs LIB= avl LIBADD= spl SRCS= avl.c diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 9195b7182d54..6c0d73561818 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -2,7 +2,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp -PACKAGE= utilities +PACKAGE= zfs LIB= icp LIBADD= diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index aaf76ed3fb28..b3a550688293 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -6,7 +6,7 @@ LIB= nvpair LIBADD= spl -PACKAGE= runtime +PACKAGE= zfs # user SRCS= libnvpair.c \ libnvpair_json.c \ diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index e8d6368fce81..82f1aa037d42 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -8,7 +8,7 @@ LIB= spl LIBADD= -PACKAGE= runtime +PACKAGE= zfs SRCS = \ assert.c \ diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile index 637385bc842e..d6a1d9fcfb7c 100644 --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -6,7 +6,7 @@ LIB= tpool LIBADD= spl -PACKAGE= runtime +PACKAGE= zfs INCS= thread_pool_impl.h SRCS= thread_pool.c diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile index ca8f5e665920..4e4ef2e69461 100644 --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -2,7 +2,7 @@ .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem -PACKAGE= runtime +PACKAGE= zfs LIB= umem SRCS= umem.c WARNS?= 3 diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 76567b50c610..d1267caa9fd3 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -2,7 +2,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil -PACKAGE= runtime +PACKAGE= zfs LIB= uutil SRCS=\ uu_alloc.c \ diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index b159955c0212..babded59199d 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -10,7 +10,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib -PACKAGE= runtime +PACKAGE= zfs LIB= zfs LIBADD= \ avl \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index 6350990064f7..2f95a34b49f7 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= runtime +PACKAGE= zfs INCS= libzfs_core.h SRCS= libzfs_core.c diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile index f84718a10de7..4e2f35848e04 100644 --- a/cddl/lib/libzfsbootenv/Makefile +++ b/cddl/lib/libzfsbootenv/Makefile @@ -3,7 +3,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv .PATH: ${SRCTOP}/sys/contrib/openzfs/include -PACKAGE= runtime +PACKAGE= zfs LIB= zfsbootenv SHLIB_MAJOR= 1 diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 0e5d24bd0ec5..7991e1964995 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -30,6 +30,7 @@ ATOMIC_SRCS= opensolaris_atomic.c PICFLAG= -fPIC .endif +PACKAGE= zfs LIB= zpool USER_C = \ diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile index b2677eb3f8ae..19aa9e35fbbf 100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -6,7 +6,7 @@ LIB= zutil LIBADD= avl geom m tpool -PACKAGE= runtime +PACKAGE= zfs INCS = zutil_import.h diff --git a/cddl/lib/pam_zfs_key/Makefile b/cddl/lib/pam_zfs_key/Makefile index cf43802090dd..c35a8a6bd615 100644 --- a/cddl/lib/pam_zfs_key/Makefile +++ b/cddl/lib/pam_zfs_key/Makefile @@ -1,7 +1,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/contrib/pam_zfs_key .PATH: ${SRCTOP}/sys/contrib/openzfs/include -PACKAGE= utilities +PACKAGE= zfs LIB= pam_zfs_key SHLIBDIR?= /usr/lib diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index 6a6ef62e4fce..0babca17e98a 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -7,7 +7,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/man/man8 .PATH: ${ZFSTOP}/module/os/freebsd/spl -PACKAGE= runtime +PACKAGE= zfs PROG= zfs MAN= \ zfs.8 \ diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index 4c2a8b94de19..7020439a4366 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -10,7 +10,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zpool/os/freebsd -PACKAGE= runtime +PACKAGE= zfs PROG= zpool MAN= \ spl.4 \ diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile index 255f4a3542b3..da180b10e733 100644 --- a/cddl/share/zfs/compatibility.d/Makefile +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -4,6 +4,8 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zpool/compatibility.d +PACKAGE= zfs + FILES= \ compat-2018 \ compat-2019 \ diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile index fcc472c24214..1e25b38d4eea 100644 --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -5,6 +5,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zinject .PATH: ${ZFSTOP}/man/man8 +PACKAGE= zfs PROG= zinject INCS= zinject.h SRCS= zinject.c translate.c diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile index cfcff71a813f..d8891a23b83f 100644 --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -5,6 +5,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zstream .PATH: ${ZFSTOP}/man/man8 +PACKAGE= zfs PROG= zstream MAN= zstream.8 MLINKS= zstream.8 zstreamdump.8 diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index 0945bb962c63..2031fedc97e5 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -7,6 +7,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/ztest .PATH: ${ZFSTOP}/man/man1 +PACKAGE= zfs PROG= ztest MAN= ztest.1 diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index efd8c746128f..3be2dea0bb95 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -5,6 +5,7 @@ ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zdb .PATH: ${ZFSTOP}/man/man8 +PACKAGE= zfs PROG= zdb MAN= zdb.8 INCS= zdb.h diff --git a/cddl/usr.sbin/zfsd/Makefile b/cddl/usr.sbin/zfsd/Makefile index 88eb9220a8cc..e263a47cb422 100644 --- a/cddl/usr.sbin/zfsd/Makefile +++ b/cddl/usr.sbin/zfsd/Makefile @@ -4,6 +4,7 @@ .include "Makefile.common" +PACKAGE= zfs PROG_CXX= zfsd MAN= zfsd.8 diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile index 24800c693cf3..56725d54ad5c 100644 --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -2,6 +2,7 @@ .PATH: ${SRCTOP}/sys/contrib/openzfs/cmd/zhack +PACKAGE= zfs PROG= zhack MAN= diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile index d1fab41578bf..4092c7475552 100644 --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -4,7 +4,7 @@ SHLIBDIR?= /lib .include -PACKAGE= runtime +PACKAGE= zfs LIB= be SHLIB_MAJOR= 1 SHLIB_MINOR= 0 diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package index fda5c90f8c6f..af4a1ed3f49f 100644 --- a/release/packages/Makefile.package +++ b/release/packages/Makefile.package @@ -146,3 +146,5 @@ wpa_COMMENT= 802.11 Supplicant wpa_DESC= 802.11 Supplicant yp_COMMENT= Yellow Pages programs yp_DESC= Yellow Pages programs +zfs_COMMENT= ZFS Libraries and Utilities +zfs_DESC= ZFS Libraries and Utilities diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile index 46d43306b9ca..fe2e6087e243 100644 --- a/sbin/bectl/Makefile +++ b/sbin/bectl/Makefile @@ -2,7 +2,7 @@ .include -PACKAGE=runtime +PACKAGE=zfs PROG= bectl MAN= bectl.8