From aa81d5a2a5c1fbdab4d4c21b3cca3aad8f137910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Mon, 1 Feb 2021 02:53:28 +0100 Subject: [PATCH] [net-fs/nfs-ganesha] bump, still wip --- net-fs/nfs-ganesha/Manifest | 2 +- net-fs/nfs-ganesha/metadata.xml | 11 ----- ...9.ebuild => nfs-ganesha-4.0_beta49.ebuild} | 41 +++++++++++++++---- profiles/desc/ganesha_fs.desc | 17 ++++++++ 4 files changed, 50 insertions(+), 21 deletions(-) rename net-fs/nfs-ganesha/{nfs-ganesha-4.0_beta29.ebuild => nfs-ganesha-4.0_beta49.ebuild} (85%) create mode 100644 profiles/desc/ganesha_fs.desc diff --git a/net-fs/nfs-ganesha/Manifest b/net-fs/nfs-ganesha/Manifest index 2c7cda1..c9e0210 100644 --- a/net-fs/nfs-ganesha/Manifest +++ b/net-fs/nfs-ganesha/Manifest @@ -1 +1 @@ -DIST nfs-ganesha-4.0_beta29.tar.gz 1845084 BLAKE2B 5cef2e879ddc799a245679be433c4091fddbb1e585830b1eb8ee3a4bc7d6a814a48355d14088cce5b59efaa74379db7453c497f889850f182f38df04d63411dc SHA512 46fde21768f387c993104d0da9dd0687e2b414b3adeb108f0475263b99909f32fe52340229575fedf270ccb26be3615796021bd93932eeb466b22863e3aaee7c +DIST nfs-ganesha-4.0_beta49.tar.gz 1877085 BLAKE2B a6e6d9c4dfe710be9ad0d90115a99137f2da9a9687f21670ba8e7e7dcb9443eb836314363bb417bc37628f861efae0017efd0107e76a1e018d737cabf4776b72 SHA512 f78d3cb02d20cd132b6a0c55cd8cd09a660c6084d0721c6e1d29602b4361619c17c6ed770a61efb367b01e409b6c45a40427eafdbee23b40dcfe2426e2fd094f diff --git a/net-fs/nfs-ganesha/metadata.xml b/net-fs/nfs-ganesha/metadata.xml index e6d8b95..e06c202 100644 --- a/net-fs/nfs-ganesha/metadata.xml +++ b/net-fs/nfs-ganesha/metadata.xml @@ -3,17 +3,6 @@ - Enables CEPH support - Enables GlusterFS support - Enables support for GPFS - Enables support for LustreFS - Enables support for NULL - Enables support for PanFS - Enables support for PROXY - Enables support for RGW - Enables support for VFS - Enables support for XFS - Enables support for ZFS Enable GSSAPI support Install Admin scripts Install GUI Admin scripts diff --git a/net-fs/nfs-ganesha/nfs-ganesha-4.0_beta29.ebuild b/net-fs/nfs-ganesha/nfs-ganesha-4.0_beta49.ebuild similarity index 85% rename from net-fs/nfs-ganesha/nfs-ganesha-4.0_beta29.ebuild rename to net-fs/nfs-ganesha/nfs-ganesha-4.0_beta49.ebuild index 9768848..38aa1dd 100644 --- a/net-fs/nfs-ganesha/nfs-ganesha-4.0_beta29.ebuild +++ b/net-fs/nfs-ganesha/nfs-ganesha-4.0_beta49.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Foundation +# Copyright 1999-2021 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=7 -#PYTHON_COMPAT=( python3_8 ) +#PYTHON_COMPAT=( python3_9 ) #inherit cmake flag-o-matic python-single-r1 inherit cmake flag-o-matic @@ -20,8 +20,8 @@ fi LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="dbus debug gssapi gui nfs3 nfsidmap rdma tools vsock" -FS_SUPPORT=" ceph glusterfs gpfs lustre mem null panfs proxy rgw vfs xfs" +IUSE="dbus debug gssapi gui +nfs3 nfsidmap tools vsock" +FS_SUPPORT=" ceph glusterfs gpfs lustre mem null panfs proxy-v3 proxy-v4 rgw vfs xfs" IUSE+=" ${FS_SUPPORT// / ganesha_fs_}" REQUIRED_USE="gui? ( tools )" @@ -29,7 +29,7 @@ REQUIRED_USE="gui? ( tools )" RDEPEND=" dev-libs/jemalloc net-libs/libnfsidmap - >=net-libs/ntirpc-3.3:=[rdma?,gssapi] + >=net-libs/ntirpc-3.4:=[gssapi] gssapi? ( virtual/krb5 ) dbus? ( sys-apps/dbus ) ganesha_fs_ceph? ( sys-cluster/ceph ) @@ -46,7 +46,13 @@ DEPEND="${RDEPEND} #S="${WORKDIR}/${P}/src" S="${WORKDIR}/${PN}-${MY_PV}/src" -CMAKE_BUILD_TYPE="Release" + +pkg_setup() { + if use tools || use gui; then + python-single-r1_pkg_setup + fi +} + src_prepare() { sed \ @@ -57,11 +63,16 @@ src_prepare() { } src_configure() { + if use debug ; then + CMAKE_BUILD_TYPE=Debug + else + CMAKE_BUILD_TYPE=Release + fi + local mycmakeargs=( -DALLOCATOR=jemalloc -DUSE_SYSTEM_NTIRPC=ON -DTIRPC_EPOLL=ON - -DKRB5_FIND_COMPONENTS="gssrpc" -DUSE_GSS=$(usex gssapi) -DUSE_DBUS=$(usex dbus) -DUSE_NFSIDMAP=$(usex nfsidmap) @@ -70,7 +81,6 @@ src_configure() { -DUSE_EFENCE=$(usex debug) -DDEBUG_SAL=$(usex debug) -DENABLE_LOCKTRACE=$(usex debug) - -DUSE_NFS_RDMA=$(usex rdma) -DUSE_NFS3=$(usex nfs3) -DUSE_NFSACL3=$(usex nfs3) -DUSE_NLM=$(usex nfs3) @@ -89,11 +99,24 @@ src_configure() { -DUSE_FSAL_MEM=$(usex ganesha_fs_mem) -DUSE_FSAL_NULL=$(usex ganesha_fs_null) -DUSE_FSAL_PANFS=$(usex ganesha_fs_panfs) - -DUSE_FSAL_PROXY=$(usex ganesha_fs_proxy) + -DUSE_FSAL_PROXY_V3=$(usex ganesha_fs_proxy-v3) + -DUSE_FSAL_PROXY_V4=$(usex ganesha_fs_proxy-v4) -DUSE_FSAL_RGW=$(usex ganesha_fs_rgw) -DUSE_FSAL_VFS=$(usex ganesha_fs_vfs) -DUSE_FSAL_XFS=$(usex ganesha_fs_xfs) + + -DUSE_FSAL_LIZARDFS=OFF + -DUSE_FSAL_KVSFS=OFF ) + + if use gui || use tools; then + mycmakeargs+=( + -DPython_INCLUDE_DIR="$(python_get_includedir)" + -DPython_LIBRARY="$(python_get_library_path)" + -DPython_EXECUTABLE="${PYTHON}" + ) + fi + cmake_src_configure } #testing diff --git a/profiles/desc/ganesha_fs.desc b/profiles/desc/ganesha_fs.desc new file mode 100644 index 0000000..840e17f --- /dev/null +++ b/profiles/desc/ganesha_fs.desc @@ -0,0 +1,17 @@ +# Copyright 1999-2021 Gentoo Authors. +# Distributed under the terms of the GNU General Public License v2 + +# This file contains descriptions of GANESHA_FS USE_EXPAND flags. + +ceph - Enables CEPH support +glusterfs - Enables GlusterFS support +gpfs - Enables support for GPFS +lustre - Enables support for LustreFS +null - Enables support for NULL +panfs - Enables support for PanFS +proxy-v3 - Enables support for PROXY_V3 +proxy-v4 - Enables support for PROXY_V4 +rgw - Enables support for RGW +vfs - Enables support for VFS +xfs - Enables support for XFS +zfs - Enables support for ZFS