From 65db5435fbd30f251a6b9eb2fba4b8ab28cd914a Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 17 Sep 2018 09:01:09 -0400 Subject: [PATCH] nfs-ganesha 2.7.0 GA Signed-off-by: Kaleb S. KEITHLEY --- nfs-ganesha.spec | 79 +++++++++++++++++++++++++++++++++++++++++++----- sources | 2 +- 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index d4ec4d6..e854d09 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -52,6 +52,9 @@ Requires: openSUSE-release %bcond_without xfs %global use_fsal_xfs %{on_off_switch xfs} +%bcond_with lustre +%global use_fsal_lustre %{on_off_switch lustre} + %bcond_without ceph %global use_fsal_ceph %{on_off_switch ceph} @@ -90,6 +93,12 @@ Requires: openSUSE-release %bcond_without rados_urls %global use_rados_urls %{on_off_switch rados_urls} +%bcond_without rpcbind +%global use_rpcbind %{on_off_switch rpcbind} + +%bcond_without mspac_support +%global use_mspac_support %{on_off_switch mspac_support} + %if ( 0%{?rhel} && 0%{?rhel} < 7 ) %global _rundir %{_localstatedir}/run %endif @@ -99,7 +108,7 @@ Requires: openSUSE-release #%%global dash_dev_version 2.6-rc5 Name: nfs-ganesha -Version: 2.6.3 +Version: 2.7.0 Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System @@ -115,6 +124,10 @@ BuildRequires: pkgconfig BuildRequires: krb5-devel %if ( 0%{?suse_version} >= 1330 ) BuildRequires: libnsl-devel +%else +%if ( 0%{?fedora} >= 28 ) +BuildRequires: libnsl2-devel +%endif %endif %if ( 0%{?suse_version} ) BuildRequires: dbus-1-devel @@ -127,9 +140,12 @@ Requires: dbus BuildRequires: libcap-devel BuildRequires: libblkid-devel BuildRequires: libuuid-devel +%if %{with mspac_support} +BuildRequires: libwbclient-devel +%endif BuildRequires: gcc-c++ %if %{with system_ntirpc} -BuildRequires: libntirpc-devel = 1.6.3 +BuildRequires: libntirpc-devel = 1.7.0 %else Requires: libntirpc = @NTIRPC_VERSION_EMBED@ %endif @@ -144,11 +160,14 @@ Requires: policycoreutils-python Requires: policycoreutils-python-utils %endif Requires: nfs-utils +%if ( 0%{?with_rpcbind} ) %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) || ( 0%{?suse_version} ) Requires: rpcbind %else Requires: portmap %endif +%endif + %if %{with_nfsidmap} %if ( 0%{?suse_version} ) BuildRequires: nfsidmap-devel @@ -158,6 +177,7 @@ BuildRequires: libnfsidmap-devel %else BuildRequires: nfs-utils-lib-devel %endif + %if %{with rdma} BuildRequires: libmooshika-devel >= 0.6-0 %endif @@ -256,15 +276,15 @@ to the ganesha.nfsd server, it makes it possible to trace using LTTng. %endif %if %{with rados_recov} -%package rados -Summary: The NFS-GANESHA's library for recovery backend +%package rados-grace +Summary: The NFS-GANESHA's command for managing the RADOS grace database Group: Applications/System BuildRequires: librados-devel >= 0.61 Requires: nfs-ganesha = %{version}-%{release} -%description rados -This package contains the librados.so library. Ganesha uses it to -store client tracking data in ceph cluster. +%description rados-grace +This package contains the ganesha-rados-grace tool for interacting with the +database used by the rados_cluster recovery backend. %endif # Option packages start here. use "rpmbuild --with gpfs" (or equivalent) @@ -345,6 +365,21 @@ This package contains a shared object to be used with FSAL_VFS to support XFS correctly %endif +#LUSTRE +%if %{with lustre} +%package lustre +Summary: The NFS-GANESHA's LUSTRE FSAL +Group: Applications/System +BuildRequires: libattr-devel +BuildRequires: lustre-client +Requires: nfs-ganesha = %{version}-%{release} +Requires: lustre-client + +%description lustre +This package contains a FSAL shared object to +be used with NFS-Ganesha to support LUSTRE based filesystems +%endif + # PANFS %if %{with panfs} %package panfs @@ -419,6 +454,7 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DUSE_FSAL_NULL=%{use_fsal_null} \ -DUSE_FSAL_MEM=%{use_fsal_mem} \ -DUSE_FSAL_XFS=%{use_fsal_xfs} \ + -DUSE_FSAL_LUSTRE=%{use_fsal_lustre} \ -DUSE_FSAL_CEPH=%{use_fsal_ceph} \ -DUSE_FSAL_RGW=%{use_fsal_rgw} \ -DUSE_FSAL_GPFS=%{use_fsal_gpfs} \ @@ -480,6 +516,10 @@ install -m 755 scripts/init.d/nfs-ganesha.el6 %{buildroot}%{_sysconfdir}/init.d install -m 644 scripts/init.d/sysconfig/ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha %endif +%if %{with lustre} +install -m 644 config_samples/lustre.conf %{buildroot}%{_sysconfdir}/ganesha +%endif + %if %{with xfs} install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha %endif @@ -488,6 +528,10 @@ install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha %endif +%if %{with rados_recov} +install -m 755 tools/ganesha-rados-grace %{buildroot}%{_bindir}/ganesha-rados-grace +%endif + %if %{with rgw} install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/rgw_bucket.conf %{buildroot}%{_sysconfdir}/ganesha @@ -592,6 +636,14 @@ exit 0 %{_mandir}/*/ganesha-log-config.8.gz %endif +%if %{with rados_recov} +%files rados-grace +%{_bindir}/ganesha-rados-grace +%if %{with man_page} +%{_mandir}/*/ganesha-rados-grace.8.gz +%{_mandir}/*/ganesha-rados-cluster-design.8.gz +%endif +%endif %files mount-9P %{_sbindir}/mount.9P @@ -613,6 +665,15 @@ exit 0 %endif # Optional packages +%if %{with lustre} +%files lustre +%{_libdir}/ganesha/libfsallustre* +%config(noreplace) %{_sysconfdir}/ganesha/lustre.conf +%if %{with man_page} +%{_mandir}/*/ganesha-lustre-config.8.gz +%endif +%endif + %if %{with nullfs} %files nullfs %{_libdir}/ganesha/libfsalnull* @@ -722,7 +783,6 @@ exit 0 %{_bindir}/fake_recall %{_bindir}/get_clientids %{_bindir}/grace_period -%{_bindir}/purge_gids %{_bindir}/ganesha_stats %{_bindir}/sm_notify.ganesha %{_bindir}/ganesha_mgr @@ -731,6 +791,9 @@ exit 0 %endif %changelog +* Mon Sep 17 2018 Kaleb S. KEITHLEY - 2.7.0-1 +- nfs-ganesha 2.7.0 GA + * Wed Aug 22 2018 Kaleb S. KEITHLEY - 2.6.3-1 - nfs-ganesha 2.6.3 GA diff --git a/sources b/sources index 34a2353..6f5ab4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.6.3.tar.gz) = 0689fbf9ce65919611927439260b0d6508973b50dbb497bb8d808d907558b7b7ea58ff8134e6edf6dd0c0b61cdbc7521adf5179e10b3d2880befc5d47ad0ecae +SHA512 (nfs-ganesha-2.7.0.tar.gz) = 8bde85f51784926a846e120212ca6eff5119f1e9af1b23b3c15c3fa7a29ac41227095ee0846d67cd9fb1965da9d89ebc39d9ef092d894d9ceb1fb54acdac491c