Index: head/devel/py-os-brick/files/02-nfs.patch =================================================================== --- head/devel/py-os-brick/files/02-nfs.patch (revision 489965) +++ head/devel/py-os-brick/files/02-nfs.patch (nonexistent) @@ -1,35 +0,0 @@ -From fe3bf36779f577ef737108eb1d30b46a75fa4748 Mon Sep 17 00:00:00 2001 -From: Alexander Nusov -Date: Thu, 8 Dec 2016 16:27:57 +0300 -Subject: [PATCH] initial NFS support - ---- - os_brick/initiator/connectors/remotefs.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/os_brick/initiator/connectors/remotefs.py b/os_brick/initiator/connectors/remotefs.py -index 50f11c1..f22b652 100644 ---- a/os_brick/initiator/connectors/remotefs.py -+++ b/os_brick/initiator/connectors/remotefs.py -@@ -26,6 +26,8 @@ LOG = logging.getLogger(__name__) - class RemoteFsConnector(base.BaseLinuxConnector): - """Connector class to attach/detach NFS and GlusterFS volumes.""" - -+ os_type = initiator.OS_TYPE_FREEBSD -+ - def __init__(self, mount_type, root_helper, driver=None, - execute=None, - device_scan_attempts=initiator.DEVICE_SCAN_ATTEMPTS_DEFAULT, -@@ -35,8 +37,7 @@ class RemoteFsConnector(base.BaseLinuxConnector): - mount_type_lower = mount_type.lower() - if conn: - mount_point_base = conn.get('mount_point_base') -- if mount_type_lower in ('nfs', 'glusterfs', 'scality', -- 'quobyte', 'vzstorage'): -+ if mount_type_lower in ('nfs',): - kwargs[mount_type_lower + '_mount_point_base'] = ( - kwargs.get(mount_type_lower + '_mount_point_base') or - mount_point_base) --- -2.8.1 - Property changes on: head/devel/py-os-brick/files/02-nfs.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/py-os-brick/files/01-os-type.patch =================================================================== --- head/devel/py-os-brick/files/01-os-type.patch (revision 489965) +++ head/devel/py-os-brick/files/01-os-type.patch (nonexistent) @@ -1,47 +0,0 @@ -From b2edffa81edb25202ec6ed08d131b8fa4153a1d5 Mon Sep 17 00:00:00 2001 -From: Alexander Nusov -Date: Thu, 8 Dec 2016 16:26:21 +0300 -Subject: [PATCH] add support for freebsd os - ---- - os_brick/initiator/__init__.py | 1 + - os_brick/initiator/connector.py | 4 ++++ - 2 files changed, 5 insertions(+) - -diff --git a/os_brick/initiator/__init__.py b/os_brick/initiator/__init__.py -index 95e0b10..aa91615 100644 ---- a/os_brick/initiator/__init__.py -+++ b/os_brick/initiator/__init__.py -@@ -34,6 +34,7 @@ PLATFORM_S390 = 'S390' - OS_TYPE_ALL = 'ALL' - OS_TYPE_LINUX = 'LINUX' - OS_TYPE_WINDOWS = 'WIN' -+OS_TYPE_FREEBSD = 'FREEBSD' - - S390X = "s390x" - S390 = "s390" -diff --git a/os_brick/initiator/connector.py b/os_brick/initiator/connector.py -index 86adfa8..989b8d6 100644 ---- a/os_brick/initiator/connector.py -+++ b/os_brick/initiator/connector.py -@@ -51,6 +51,7 @@ PLATFORM_S390 = 'S390' - OS_TYPE_ALL = 'ALL' - OS_TYPE_LINUX = 'LINUX' - OS_TYPE_WINDOWS = 'WIN' -+OS_TYPE_FREEBSD = 'FREEBSD' - - S390X = "s390x" - S390 = "s390" -@@ -204,6 +205,9 @@ def get_connector_properties(root_helper, my_ip, multipath, enforce_multipath, - props['ip'] = my_ip - props['host'] = host if host else socket.gethostname() - -+ if sys.platform.startswith('freebsd'): -+ props['os_type'] = OS_TYPE_FREEBSD -+ - for item in connector_list: - connector = importutils.import_class(item) - --- -2.8.1 - Property changes on: head/devel/py-os-brick/files/01-os-type.patch ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/py-os-brick/Makefile =================================================================== --- head/devel/py-os-brick/Makefile (revision 489965) +++ head/devel/py-os-brick/Makefile (revision 489966) @@ -1,44 +1,53 @@ # Created by: Alexander Nusov # $FreeBSD$ PORTNAME= os-brick -PORTVERSION= 1.10.0 +PORTVERSION= 2.3.4 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= alexander.nusov@nfvexpress.com COMMENT= Openstack cinder brick library for managing local volume attaches LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=1.8:devel/py-pbr@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}os-win>=1.3.0:devel/py-os-win@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}castellan>=0.4.0:devel/py-castellan@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}retrying>=0:devel/py-retrying@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.10.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.18.0:devel/py-oslo.utils@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.10.0:devel/py-oslo.service@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.9.0:devel/py-oslo.privsep@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=2.1.0:devel/py-oslo.i18n@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.serialization>=1.10.0:devel/py-oslo.serialization@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.11.0:devel/py-oslo.log@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.8.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}eventlet>=0:net/py-eventlet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}eventlet>=0.18.2:net/py-eventlet@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.concurrency>=3.25.0:devel/py-oslo.concurrency@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.log>=3.36.0:devel/py-oslo.log@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.i18n>=3.15.3:devel/py-oslo.i18n@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.privsep>=1.23.0:devel/py-oslo.privsep@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.service>=1.24.0:devel/py-oslo.service@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}oslo.utils>=3.33.0:devel/py-oslo.utils@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}os-win>=3.0.0:devel/py-os-win@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.14.2:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}retrying>=1.2.3:devel/py-retrying@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} -NO_ARCH= yes - -EXTRA_PATCHES= ${FILESDIR}/01-os-type.patch:-p1 \ - ${FILESDIR}/02-nfs.patch:-p1 - USES= python USE_PYTHON= autoplist distutils +NO_ARCH= yes + +MY_REGEX= (/etc/) + post-patch: - @${ECHO_CMD} "os-brick configuration at ${PREFIX}/etc/os-brick/rootwrap.d" >> \ - ${WRKSRC}/etc/os-brick.readme - @${ECHO_CMD} "os-brick configuration" >> ${WRKSRC}/etc/os-brick/info + # Prevent the installation of files into ${ETCDIR} by distutils. We do it + # manually in the post-install target + @${REINPLACE_CMD} -e '/etc\//d' ${WRKSRC}/setup.cfg + # Replace (hardcoded) paths of config, documentation and Python files + @${GREP} -Rl -Ee '${MY_REGEX}' --null \ + ${WRKSRC}/etc ${WRKSRC}/os_brick | \ + ${XARGS} -0 ${REINPLACE_CMD} -i '' -Ee \ + "s,${MY_REGEX},${PREFIX}\1,g" + +post-install: + @${MKDIR} ${STAGEDIR}${ETCDIR}/rootwrap.d + ${INSTALL_DATA} ${WRKSRC}/etc/os-brick/rootwrap.d/os-brick.filters \ + ${STAGEDIR}${ETCDIR}/rootwrap.d/os-brick.filters.sample .include Index: head/devel/py-os-brick/distinfo =================================================================== --- head/devel/py-os-brick/distinfo (revision 489965) +++ head/devel/py-os-brick/distinfo (revision 489966) @@ -1,3 +1,3 @@ -TIMESTAMP = 1485279938 -SHA256 (os-brick-1.10.0.tar.gz) = b0d69f7b23b98ce5632e3fdea85592a15408156a21692a15486f38bf4736dbd6 -SIZE (os-brick-1.10.0.tar.gz) = 140387 +TIMESTAMP = 1539433948 +SHA256 (os-brick-2.3.4.tar.gz) = 637ff2d26ce800aa410a257202c4703a1f672ba500a23b32c5872ee786a8e794 +SIZE (os-brick-2.3.4.tar.gz) = 169329 Property changes on: head/devel/py-os-brick/distinfo ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/devel/py-os-brick/pkg-descr =================================================================== --- head/devel/py-os-brick/pkg-descr (revision 489965) +++ head/devel/py-os-brick/pkg-descr (revision 489966) @@ -1,3 +1,8 @@ OpenStack Cinder brick library for managing local volume attaches +Features: + +- Discovery of volumes being attached to a host for many transport protocols. +- Removal of volumes from a host. + WWW: https://pypi.org/project/os-brick/ Property changes on: head/devel/py-os-brick/pkg-descr ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/devel/py-os-brick/pkg-plist =================================================================== --- head/devel/py-os-brick/pkg-plist (nonexistent) +++ head/devel/py-os-brick/pkg-plist (revision 489966) @@ -0,0 +1,4 @@ +@dir %%ETCDIR%% +@owner root +@dir %%ETCDIR%%/rootwrap.d +@sample %%ETCDIR%%/rootwrap.d/os-brick.filters.sample Property changes on: head/devel/py-os-brick/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property