Update to V2.0.0 release

Fix strict compile problem with LUSTRE FSAL
This commit is contained in:
Jim Lieb 2013-12-10 16:55:15 -08:00
parent f9d3726c22
commit 2dc956f347
3 changed files with 22 additions and 7 deletions

View File

@ -0,0 +1,12 @@
diff -up nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h.lustre-strict nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h
--- nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h.lustre-strict 2013-12-10 16:01:48.823633927 -0800
+++ nfs-ganesha-2.0.0/src/FSAL/FSAL_LUSTRE/fsal_handle.h 2013-12-10 16:02:38.036661006 -0800
@@ -109,7 +109,7 @@ static inline int lustre_name_to_handle_
struct lustre_file_handle
*out_handle, int flags)
{
- char path[MAXPATHLEN];
+ char path[MAXPATHLEN + 2];
if (!mntpath || !at_handle || !name || !out_handle)
return -1;

View File

@ -1,13 +1,14 @@
# %%global prereltag rcfinal
%global reltag pre-2.0-RC-final
%global version 2.0.0
%global reltag V%{version}
%global ntirpcname ntirpc
%global ntirpcvers 1.0.0
%global _hardened_build 1
Name: nfs-ganesha
Version: 2.0.0
Version: %{version}
Release: 1%{?prereltag:.%{prereltag}}%{?dist}
Summary: Ganesha NFS Server
Group: System Environment/Libraries
@ -16,10 +17,11 @@ URL: https://github.com/nfs-ganesha/nfs-ganesha/wiki
ExclusiveArch: x86_64
ExclusiveArch: aarch64
Source0: https://github.com/%{name}/%{name}/archive/%{reltag}.tar.gz
Source1: https://github.com/%{name}/%{ntirpcname}/archive/v%{ntirpcvers}.tar.gz
Source0: %{name}-%{version}.tar.gz
Source1: %{ntirpcname}-%{ntirpcvers}.tar.gz
Source2: nfs-ganesha.service
Patch1: nfs-ganesha-2.0.0rc5.patch
Patch2: nfs-ganesha-2.0.0-lustre-strict.patch
# Bundling exception through Fedora 23
# https://fedorahosted.org/fpc/ticket/363
@ -78,10 +80,11 @@ clusters such as CEPH and GLUSTERFS. There is also a PROXY back-end
which operates as an NFSv4 client.
%prep
%setup -q -n %{name}-%{reltag} -a 1
%setup -q -n %{name}-%{version} -a 1
rm -rf contrib/libzfswrapper
mv %{ntirpcname}-%{ntirpcvers}/* src/libntirpc/
%patch1 -p1
%patch2 -p1
%build
%cmake -DCMAKE_BUILD_TYPE=Maintainer -DBUILD_CONFIG=everything -DCMAKE_INSTALL_PREFIX=%{buildroot}/usr ./src

View File

@ -1,2 +1,2 @@
5d116f9306a254b44e68c96dba5ac9d5 pre-2.0-RC-final.tar.gz
5a7c90879d6ce3d3a927defe3fbd0939 v1.0.0.tar.gz
5a7c90879d6ce3d3a927defe3fbd0939 ntirpc-1.0.0.tar.gz
30335404075b43fd328708aa8ff2d39f nfs-ganesha-2.0.0.tar.gz