Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Jun 2019 19:51:54 +0000 (UTC)
From:      Kris Moore <kmoore@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r503975 - in head: . sysutils sysutils/openzfs sysutils/openzfs-kmod sysutils/zol sysutils/zol-kmod
Message-ID:  <201906111951.x5BJpsZB087458@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kmoore
Date: Tue Jun 11 19:51:54 2019
New Revision: 503975
URL: https://svnweb.freebsd.org/changeset/ports/503975

Log:
  - Rename sysutils/zol -> sysutils/openzfs
  - Rename sysutils/zol-kmod -> sysutils/openzfs-kmod
  - Update to 2019061000
  - Update MOVED
  - Adds ioctl compat with legacy ZFS userland binaries
  
  Sponsored by: iXsystems

Added:
  head/sysutils/openzfs/
     - copied from r503974, head/sysutils/zol/
  head/sysutils/openzfs-kmod/
     - copied from r503974, head/sysutils/zol-kmod/
Deleted:
  head/sysutils/zol/
  head/sysutils/zol-kmod/
Modified:
  head/MOVED
  head/sysutils/Makefile
  head/sysutils/openzfs-kmod/Makefile
  head/sysutils/openzfs-kmod/distinfo
  head/sysutils/openzfs-kmod/pkg-descr
  head/sysutils/openzfs/Makefile
  head/sysutils/openzfs/distinfo
  head/sysutils/openzfs/pkg-descr
  head/sysutils/openzfs/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Jun 11 18:47:33 2019	(r503974)
+++ head/MOVED	Tue Jun 11 19:51:54 2019	(r503975)
@@ -12791,3 +12791,5 @@ multimedia/vdr-plugin-softhddevice||2019-05-31|Has exp
 devel/pecl-pthreads||2019-06-02|Has expired: Does not work with recent versions of php
 net-mgmt/ccnet-client||2019-06-10|Removed, no longer has dependencies and has been abandoned upstream
 textproc/cdiff|textproc/ydiff|2019-06-11|Renamed to match upstream
+sysutils/zol|sysutils/openzfs|2019-06-11|Renamed to match upstream changes
+sysutils/zol-kmod|sysutils/openzfs-kmod|2019-06-11|Renamed to match upstream changes

Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile	Tue Jun 11 18:47:33 2019	(r503974)
+++ head/sysutils/Makefile	Tue Jun 11 19:51:54 2019	(r503975)
@@ -759,6 +759,8 @@
     SUBDIR += openhpi
     SUBDIR += openipmi
     SUBDIR += openupsd
+    SUBDIR += openzfs
+    SUBDIR += openzfs-kmod
     SUBDIR += ori
     SUBDIR += osinfo-db-tools
     SUBDIR += osquery
@@ -1548,8 +1550,6 @@
     SUBDIR += zisofs-tools
     SUBDIR += znapzend
     SUBDIR += zogftw
-    SUBDIR += zol
-    SUBDIR += zol-kmod
     SUBDIR += zrep
     SUBDIR += zrepl
     SUBDIR += zsd

Modified: head/sysutils/openzfs-kmod/Makefile
==============================================================================
--- head/sysutils/zol-kmod/Makefile	Tue Jun 11 18:47:33 2019	(r503974)
+++ head/sysutils/openzfs-kmod/Makefile	Tue Jun 11 19:51:54 2019	(r503975)
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
-PORTNAME=	zol
-PORTVERSION=	2019053000
+PORTNAME=	openzfs
+PORTVERSION=	2019061000
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-kmod
 
 MAINTAINER=	kmoore@FreeBSD.org
-COMMENT=	ZFS on Linux kernel module for FreeBSD
+COMMENT=	OpenZFS kernel module for FreeBSD
 
 LICENSE=	CDDL
 
@@ -15,8 +15,8 @@ USES=		kmod
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	a67416d
-KMODTARGET?=	zfs.ko
+GH_TAGNAME=	ea4b6fc
+KMODTARGET?=	openzfs.ko
 
 PLIST_FILES=	${KMODDIR}/${KMODTARGET}
 
@@ -47,9 +47,9 @@ do-build:
 	(cd ${WRKSRC}/module/ && make -f Makefile.bsd CC=${CC} ${MAKE_OPTS})
 
 do-install:
-	${INSTALL} ${WRKSRC}/module/zfs.ko ${STAGEDIR}${KMODDIR}/${KMODTARGET}
+	${INSTALL} ${WRKSRC}/module/openzfs.ko ${STAGEDIR}${KMODDIR}/${KMODTARGET}
 .if ${PORT_OPTIONS:MDEBUG}
-	${INSTALL} ${WRKSRC}/module/zfs.ko.debug ${STAGEDIR}${KMODDIR}/${KMODTARGET}.debug
+	${INSTALL} ${WRKSRC}/module/openzfs.ko.debug ${STAGEDIR}${KMODDIR}/${KMODTARGET}.debug
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/sysutils/openzfs-kmod/distinfo
==============================================================================
--- head/sysutils/zol-kmod/distinfo	Tue Jun 11 18:47:33 2019	(r503974)
+++ head/sysutils/openzfs-kmod/distinfo	Tue Jun 11 19:51:54 2019	(r503975)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559224191
-SHA256 (zfsonfreebsd-ZoF-v2019053000-a67416d_GH0.tar.gz) = 488c10a8443f7534852f7bb315c3240d1df6eccfe0982fe41e05c17285bfb128
-SIZE (zfsonfreebsd-ZoF-v2019053000-a67416d_GH0.tar.gz) = 6744965
+TIMESTAMP = 1560197751
+SHA256 (zfsonfreebsd-ZoF-v2019061000-ea4b6fc_GH0.tar.gz) = b54ee5f1956974547aff5c916611e57be4cb435131201f725f0e37c9bd0836c8
+SIZE (zfsonfreebsd-ZoF-v2019061000-ea4b6fc_GH0.tar.gz) = 6749043

Modified: head/sysutils/openzfs-kmod/pkg-descr
==============================================================================
--- head/sysutils/zol-kmod/pkg-descr	Tue Jun 11 18:47:33 2019	(r503974)
+++ head/sysutils/openzfs-kmod/pkg-descr	Tue Jun 11 19:51:54 2019	(r503975)
@@ -1,3 +1,3 @@
-ZFS on FreeBSD
+Kernel module for OpenZFS on FreeBSD
 
 WWW: https://github.com/zfsonfreebsd/ZoF

Modified: head/sysutils/openzfs/Makefile
==============================================================================
--- head/sysutils/zol/Makefile	Tue Jun 11 18:47:33 2019	(r503974)
+++ head/sysutils/openzfs/Makefile	Tue Jun 11 19:51:54 2019	(r503975)
@@ -1,18 +1,18 @@
 # $FreeBSD$
 
-PORTNAME=	zol
-PORTVERSION=	2019053000
+PORTNAME=	openzfs
+PORTVERSION=	2019061000
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
 MAINTAINER=	kmoore@FreeBSD.org
-COMMENT=	ZFS on Linux userland for FreeBSD
+COMMENT=	OpenZFS userland for FreeBSD
 
 LICENSE=	CDDL
 
 BROKEN_aarch64=	invokes x86 assembler
 
-RUN_DEPENDS=	zol-kmod>=0:sysutils/zol-kmod
+RUN_DEPENDS=	openzfs-kmod>=0:sysutils/openzfs-kmod
 
 USES+=		autoreconf:build libtool gmake gettext-runtime:run python:3.3+,build shebangfix
 
@@ -25,7 +25,7 @@ OPTIONS_SUB=    yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	zfsonfreebsd
 GH_PROJECT=	ZoF
-GH_TAGNAME=	a67416d
+GH_TAGNAME=	ea4b6fc
 
 .include <bsd.port.pre.mk>
 

Modified: head/sysutils/openzfs/distinfo
==============================================================================
--- head/sysutils/zol/distinfo	Tue Jun 11 18:47:33 2019	(r503974)
+++ head/sysutils/openzfs/distinfo	Tue Jun 11 19:51:54 2019	(r503975)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559224194
-SHA256 (zfsonfreebsd-ZoF-v2019053000-a67416d_GH0.tar.gz) = 488c10a8443f7534852f7bb315c3240d1df6eccfe0982fe41e05c17285bfb128
-SIZE (zfsonfreebsd-ZoF-v2019053000-a67416d_GH0.tar.gz) = 6744965
+TIMESTAMP = 1560196955
+SHA256 (zfsonfreebsd-ZoF-v2019061000-ea4b6fc_GH0.tar.gz) = b54ee5f1956974547aff5c916611e57be4cb435131201f725f0e37c9bd0836c8
+SIZE (zfsonfreebsd-ZoF-v2019061000-ea4b6fc_GH0.tar.gz) = 6749043

Modified: head/sysutils/openzfs/pkg-descr
==============================================================================
--- head/sysutils/zol/pkg-descr	Tue Jun 11 18:47:33 2019	(r503974)
+++ head/sysutils/openzfs/pkg-descr	Tue Jun 11 19:51:54 2019	(r503975)
@@ -1,3 +1,3 @@
-Port of the ZFS on Linux project to FreeBSD
+Port of the OpenZFS project to FreeBSD
 
 WWW: https://github.com/zfsonfreebsd/ZoF

Modified: head/sysutils/openzfs/pkg-plist
==============================================================================
--- head/sysutils/zol/pkg-plist	Tue Jun 11 18:47:33 2019	(r503974)
+++ head/sysutils/openzfs/pkg-plist	Tue Jun 11 19:51:54 2019	(r503975)
@@ -288,24 +288,24 @@ include/libzfs/zfs_namecheck.h
 include/libzfs/zfs_prop.h
 lib/libnvpair.a
 lib/libnvpair.so
-lib/libnvpair.so.1
-lib/libnvpair.so.1.0.1
+lib/libnvpair.so.3
+lib/libnvpair.so.3.0.0
 lib/libuutil.a
 lib/libuutil.so
 lib/libuutil.so.1
 lib/libuutil.so.1.0.1
 lib/libzfs.a
 lib/libzfs.so
-lib/libzfs.so.2
-lib/libzfs.so.2.0.0
+lib/libzfs.so.4
+lib/libzfs.so.4.0.0
 lib/libzfs_core.a
 lib/libzfs_core.so
 lib/libzfs_core.so.1
 lib/libzfs_core.so.1.0.0
 lib/libzpool.a
 lib/libzpool.so
-lib/libzpool.so.2
-lib/libzpool.so.2.0.0
+lib/libzpool.so.4
+lib/libzpool.so.4.0.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/libzfs_core/__pycache__/_constants.cpython-%%PYTHON_SUFFIX%%.pyc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906111951.x5BJpsZB087458>