From nobody Thu Mar 27 10:21:26 2025 X-Original-To: dev-commits-ports-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 4ZNfnz07nPz5r7v1; Thu, 27 Mar 2025 10:21:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNfny6ZL2z3TSM; Thu, 27 Mar 2025 10:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743070887; 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=PRIzhcM1/Kk12r1h/eEgvejAaYbx2hcaQL0em+sCVyE=; b=rwcatt7f7/59CTQqzh/uRMZFssKczuDWMNV9h3R8LdIz1K9yLHHpfX+JD7Kts9W1asf6oU 5wXTFZOcwuMiW9dHY/YTiGsxOdFRTskkt0lK8fIOZXJrWBPvROxGhIYwM5ZJvKLMQjvqHq 4aSxXwVlOejO6byJuH7wVmeDCVBagjG23wxrkhAT6eAWqqP4hAmaOXaegRvUaVRN44rL0j UD7JHj9G+sOB+ZINMq2j+QqPti1lHwjn4bkq7IDptykoHk2+RBmXbUBEPQGVSLFViDqH3w Znpvp0GzDkJR6nKEikjX+P+L0ZPvy9XwEBxbUfRKdRixD5Hm8+C6zkGaG4e3hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743070886; a=rsa-sha256; cv=none; b=XlwXYS1wuXSUXbawJPfPa2m+k+jFJQ+1jMm8eq99ReazQGWyPwCNAvXPF9iQkjDnLpGdtI KZFG4BN6XWDvqceuTUBFgYfXy8hfsn8OaiJhkqlnLeM/syU/qNriavQZqQd0NOlI9R5LUy pXmFrQB7iy/h7S8rYwHC8EidYcr5akLLt/l6BX/JvSfcmhmqolwISPFBaf8F5On5j03PGi +amiUf6BcO9YN1u09EgLLs1b7/wjkO0jPQThKeh06usB2Liykezr1AmvEj63b3+Mmbx6kd mmE1UWck1jxQhdiiImAuC2AOtOJm6IaJNAYWPqZvLuCbJ4/fAoM5vjPKC9Wzww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743070886; 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=PRIzhcM1/Kk12r1h/eEgvejAaYbx2hcaQL0em+sCVyE=; b=BXwO+RFe6JAUhgqcmgbCuzIAVBeFE74Knhn2mNA3jZN2HCSKHWFV8bVvZMrPyO7CgpH2RH TFgjml0TfqgINriebUPsr6K0fkVPTNzoVq9FT+LF/4rPAXCcSpxGnggEA4aZGsHki7epQ/ Iola3P6jUgOVqq7pS61gSaPPf/sJtg1ukDu48/+P0usWS9L/UeMdvEeuv1YjK06lQUUJ4x 9l4sMA/jc8lmf1z/WwXroJQNkpf80TSdx5IDVcGi62IO9dLi7/Bq2gfGopfgf6yM/+KOxV fCIcQAAhnd2Oj7MOJgOfpHVM/SkxyIJwSQYNK45fsaBluVlpfizs8VT/4Tm2kg== 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 4ZNfny5yDkzsfq; Thu, 27 Mar 2025 10:21:26 +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 52RALQsR044966; Thu, 27 Mar 2025 10:21:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52RALQtC044954; Thu, 27 Mar 2025 10:21:26 GMT (envelope-from git) Date: Thu, 27 Mar 2025 10:21:26 GMT Message-Id: <202503271021.52RALQtC044954@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Martin Matuska Subject: git: f397e4f42558 - main - filesystems/openzfs-kmod: Update to 2.3.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f397e4f425584565ccfc21ac8d7f73d86a026034 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/ports/commit/?id=f397e4f425584565ccfc21ac8d7f73d86a026034 commit f397e4f425584565ccfc21ac8d7f73d86a026034 Author: Martin Matuska AuthorDate: 2025-03-27 10:17:43 +0000 Commit: Martin Matuska CommitDate: 2025-03-27 10:18:37 +0000 filesystems/openzfs-kmod: Update to 2.3.1 - This port will have the latest OpenZFS release version - Bump PORTEPOCH - Take maintainership --- filesystems/openzfs-kmod/Makefile | 36 +++++++++++++++++------------------- filesystems/openzfs-kmod/distinfo | 6 +++--- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/filesystems/openzfs-kmod/Makefile b/filesystems/openzfs-kmod/Makefile index 63bf3ad7f787..98d14d3151b8 100644 --- a/filesystems/openzfs-kmod/Makefile +++ b/filesystems/openzfs-kmod/Makefile @@ -1,21 +1,19 @@ PORTNAME= openzfs -PORTVERSION= 2023113000 -DISTVERSIONPREFIX= v +PORTVERSION= 2.3.1 +PORTEPOCH= 1 CATEGORIES= filesystems sysutils +MASTER_SITES= https://github.com/openzfs/zfs/releases/download/zfs-${PORTVERSION}/ PKGNAMESUFFIX?= -kmod +DISTNAME= zfs-${DISTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mm@FreeBSD.org COMMENT= OpenZFS kernel module for FreeBSD WWW= https://github.com/openzfs/zfs LICENSE= CDDL -BROKEN= build fails - USES= cpe kmod -USE_GITHUB= yes -GH_PROJECT= zfs -GH_TAGNAME= 494aaae +OPENZFS_TAGNAME= f3e4043a3 KMODTARGET?= openzfs.ko PLIST_FILES= ${KMODDIR}/${KMODTARGET} @@ -29,6 +27,9 @@ GCOV_DESC= Build kernel module with GCOV support (Requires gcc) INVARIANTS_DESC= Build kernel module with INVARIANTS INVARIANTS_IMPLIES= DEBUG +WRKSRC_SUBDIR= module +MAKEFILE= Makefile.bsd + .include MAKE_OPTS+= SYSDIR=${SRC_BASE}/sys @@ -47,22 +48,19 @@ USE_GCC= yes MAKE_OPTS+= WITH_GCOV=true .endif -ZFS_META_GITREV= ${GH_PROJECT}-${GH_TAGNAME} -ZFS_META_RELEASE= ${GH_PROJECT}_${GH_TAGNAME} -ZFS_META_VERSION= ${DISTVERSIONPREFIX}${PORTVERSION} +ZFS_META_GITREV= zfs-${PORTVERSION}-0-g${OPENZFS_TAGNAME}-dist +ZFS_META_RELEASE= 1 +ZFS_META_VERSION= ${PORTVERSION} post-patch: - ${ECHO} '#define ZFS_META_GITREV "${ZFS_META_GITREV}"' > ${WRKSRC}/include/zfs_gitrev.h - ${ECHO} '#define ZFS_META_RELEASE "${ZFS_META_RELEASE}"' > ${WRKSRC}/zfs_config.h - ${ECHO} '#define ZFS_META_VERSION "${ZFS_META_VERSION}"' >> ${WRKSRC}/zfs_config.h - -do-build: - (cd ${WRKSRC}/module/ && make -f Makefile.bsd CC=${CC} ${MAKE_OPTS}) + ${ECHO} '#define ZFS_META_GITREV "${ZFS_META_GITREV}"' > ${WRKDIR}/${DISTNAME}/include/zfs_gitrev.h + ${ECHO} '#define ZFS_META_RELEASE "${ZFS_META_RELEASE}"' > ${WRKDIR}/${DISTNAME}/zfs_config.h + ${ECHO} '#define ZFS_META_VERSION "${ZFS_META_VERSION}"' >> ${WRKDIR}/${DISTNAME}/zfs_config.h do-install: - ${INSTALL} ${WRKSRC}/module/openzfs.ko ${STAGEDIR}${KMODDIR}/${KMODTARGET} + ${INSTALL} ${WRKSRC}/openzfs.ko ${STAGEDIR}${KMODDIR}/${KMODTARGET} .if ${PORT_OPTIONS:MDEBUG} - ${INSTALL} ${WRKSRC}/module/openzfs.ko.debug ${STAGEDIR}${KMODDIR}/${KMODTARGET}.debug + ${INSTALL} ${WRKSRC}/openzfs.ko.debug ${STAGEDIR}${KMODDIR}/${KMODTARGET}.debug .endif .include diff --git a/filesystems/openzfs-kmod/distinfo b/filesystems/openzfs-kmod/distinfo index 46df98bb02c8..2a6804bb1826 100644 --- a/filesystems/openzfs-kmod/distinfo +++ b/filesystems/openzfs-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1701967598 -SHA256 (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 7f77e73bacb7bb081e3344fb20e5ebffd6a6c0b10cad1b6c572d44866a94eea6 -SIZE (openzfs-zfs-v2023113000-494aaae_GH0.tar.gz) = 33039586 +TIMESTAMP = 1743064954 +SHA256 (zfs-2.3.1.tar.gz) = 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006 +SIZE (zfs-2.3.1.tar.gz) = 34048716