rpms/nfs-ganesha
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into f25

Browse Source
This commit is contained in:
Kaleb S. KEITHLEY 2016-09-06 10:07:20 -04:00
commit bcfb3a3d9c
3 changed files with 17 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
nfs-ganesha-2.4rc1-FSAL.patch
View File

@ -1,60 +1,20 @@
--- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c.orig 2016-08-29 12:24:44.350041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c 2016-08-29 12:24:52.429041751 -0400
@@ -31,9 +31,7 @@
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_CEPH/handle.c 2016-08-29 13:42:12.502041751 -0400
@@ -31,6 +31,7 @@
* fsal_obj_handle type.
*/
-#ifdef LINUX
+#include "config.h"
#ifdef LINUX
#include <sys/sysmacros.h> /* for makedev(3) */
-#endif
#include <fcntl.h>
#include <cephfs/libcephfs.h>
#include "fsal.h"
#endif
--- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c.orig 2016-08-29 12:25:01.223041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c 2016-08-29 12:25:07.761041751 -0400
@@ -21,9 +21,7 @@
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_GLUSTER/handle.c 2016-08-29 13:42:34.090041751 -0400
@@ -21,6 +21,7 @@
* -------------
*/
-#ifdef LINUX
+#include "config.h"
#ifdef LINUX
#include <sys/sysmacros.h> /* for makedev(3) */
-#endif
#include <fcntl.h>
#include "fsal.h"
#include "gluster_internal.h"
--- nfs-ganesha-2.4-rc1/src/FSAL/FSAL_VFS/handle.c.orig 2016-08-29 12:25:14.822041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/FSAL_VFS/handle.c 2016-08-29 12:25:21.980041751 -0400
@@ -32,9 +32,7 @@
#include "config.h"
-#ifdef LINUX
#include <sys/sysmacros.h> /* for makedev(3) */
-#endif
#include <libgen.h> /* used for 'dirname' */
#include <pthread.h>
#include <string.h>
--- nfs-ganesha-2.4-rc1/src/FSAL/fsal_convert.c.orig 2016-08-29 12:24:12.086041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/fsal_convert.c 2016-08-29 12:25:41.084041751 -0400
@@ -9,9 +9,7 @@
*/
#include "config.h"
-#ifdef LINUX
#include <sys/sysmacros.h> /* for major(3), minor(3) */
-#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
--- nfs-ganesha-2.4-rc1/src/FSAL/commonlib.c.orig 2016-08-29 12:23:57.398041751 -0400
+++ nfs-ganesha-2.4-rc1/src/FSAL/commonlib.c 2016-08-29 12:25:37.686041751 -0400
@@ -41,9 +41,7 @@
#include "config.h"
#include <misc/queue.h> /* avoid conflicts with sys/queue.h */
-#ifdef LINUX
#include <sys/sysmacros.h> /* for major(3), minor(3) */
-#endif
#include <libgen.h> /* used for 'dirname' */
#include <pthread.h>
#include <sys/stat.h>
#endif

11
nfs-ganesha.spec
View File

@ -74,16 +74,15 @@ Requires: sles-release >= 12
Name: nfs-ganesha
Version: 2.4.0
%global dev rc1
%global dash_dev_version 2.4-rc1
Release: 0.17%{?dev:%{dev}}%{?dist}
%global dev rc2
%global dash_dev_version 2.4-rc2
Release: 0.18%{?dev:%{dev}}%{?dist}
Summary: NFS-Ganesha is a NFS Server running in user space
Group: Applications/System
License: LGPLv3+
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
Patch0: nfs-ganesha-2.4rc1-FSAL.patch
BuildRequires: cmake
BuildRequires: bison
@ -303,7 +302,6 @@ be used with NFS-Ganesha to support Gluster
%prep
%setup -q -n %{name}-%{dash_dev_version}
rm -rf contrib/libzfswrapper
%patch0 -p1
%build
cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \
@ -548,6 +546,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
%endif
%changelog
* Tue Sep 6 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.18rc2
- 2.4-rc2
* Mon Aug 29 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.17rc1
- 2.4-rc1

2
sources
View File

@ -1 +1 @@
38ed1ef1be6fac0eeb51d280e9d7951a nfs-ganesha-2.4-rc1.tar.gz
1fffa999bd71f9a8784223eb817664fd nfs-ganesha-2.4-rc2.tar.gz