dirkmueller/glusterfs
SHA256
1
0
Fork 0
forked from pool/glusterfs
Code Pull Requests Activity

Accepting request 86688 from home:jengelh:dev

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/86688
OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=1
This commit is contained in:
Pascal Bleser 2011-10-05 19:06:52 +00:00 committed by Git OBS Bridge
commit b1c48efe96
7 changed files with 634 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

3
glusterfs-3.2.4.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2929dc9bc08adb1f8c52ab5552d62b0aa07e218dba05523a24f674f22d82bfb6
size 1416200

58
glusterfs-date.diff Normal file
View File

@ -0,0 +1,58 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-10-05 13:17:29.728670235 +0200
Upstream: hell yes
build: remove __DATE__ and __TIME__ flagged by rpmlint
glusterfs.x86_64: W: file-contains-date-and-time /usr/sbin/glusterfsd
glusterfs.x86_64: W: file-contains-date-and-time /usr/sbin/gluster
Your file uses __DATE and __TIME__ this causes the package to rebuild when
not needed
---
cli/src/cli.c | 2 +-
glusterfsd/src/glusterfsd.c | 2 +-
libglusterfs/src/graph.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
Index: glusterfs-3.2.4/cli/src/cli.c
===================================================================
--- glusterfs-3.2.4.orig/cli/src/cli.c
+++ glusterfs-3.2.4/cli/src/cli.c
@@ -81,7 +81,7 @@ static char gf_doc[] = "";
static char argp_doc[] = "";
const char *argp_program_version = "" \
- PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ \
+ PACKAGE_NAME" "PACKAGE_VERSION \
"\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n" \
"Copyright (c) 2006-2011 Gluster Inc. " \
"<http://www.gluster.com>\n" \
Index: glusterfs-3.2.4/glusterfsd/src/glusterfsd.c
===================================================================
--- glusterfs-3.2.4.orig/glusterfsd/src/glusterfsd.c
+++ glusterfs-3.2.4/glusterfsd/src/glusterfsd.c
@@ -87,7 +87,7 @@ static char gf_doc[] = "";
static char argp_doc[] = "--volfile-server=SERVER [MOUNT-POINT]\n" \
"--volfile=VOLFILE [MOUNT-POINT]";
const char *argp_program_version = "" \
- PACKAGE_NAME" "PACKAGE_VERSION" built on "__DATE__" "__TIME__ \
+ PACKAGE_NAME" "PACKAGE_VERSION \
"\nRepository revision: " GLUSTERFS_REPOSITORY_REVISION "\n" \
"Copyright (c) 2006-2011 Gluster Inc. " \
"<http://www.gluster.com>\n" \
Index: glusterfs-3.2.4/libglusterfs/src/graph.c
===================================================================
--- glusterfs-3.2.4.orig/libglusterfs/src/graph.c
+++ glusterfs-3.2.4/libglusterfs/src/graph.c
@@ -54,8 +54,8 @@ _gf_dump_details (int argc, char **argv)
fprintf (gf_log_logfile,
"========================================"
"========================================\n");
- fprintf (gf_log_logfile, "Version : %s %s built on %s %s\n",
- PACKAGE_NAME, PACKAGE_VERSION, __DATE__, __TIME__);
+ fprintf (gf_log_logfile, "Version : %s %s\n",
+ PACKAGE_NAME, PACKAGE_VERSION);
fprintf (gf_log_logfile, "git: %s\n",
GLUSTERFS_REPOSITORY_REVISION);
fprintf (gf_log_logfile, "Starting Time: %s\n", timestr);

38
glusterfs-init.diff Normal file
View File

@ -0,0 +1,38 @@
---
extras/init.d/glusterd-SuSE.in | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Index: glusterfs-3.2.4/extras/init.d/glusterd-SuSE.in
===================================================================
--- glusterfs-3.2.4.orig/extras/init.d/glusterd-SuSE.in
+++ glusterfs-3.2.4/extras/init.d/glusterd-SuSE.in
@@ -2,8 +2,8 @@
#
### BEGIN INIT INFO
# Provides: glusterd
-# Required-Start: $local_fs $network
-# Required-Stop:
+# Required-Start: $remote_fs $network
+# Required-Stop: $remote_fs $network
# Default-Start: 3 5
# Default-Stop:
# Short-Description: Gluster File System service for volume management
@@ -61,13 +61,17 @@ case $1 in
fi
rc_status -v
;;
+ reload)
+ rc_failed 3
+ rc_status -v
+ ;;
restart)
$0 stop
$0 start
rc_status
;;
*)
- echo $"Usage: $0 {start|stop|status|restart}."
+ echo $"Usage: $0 {start|stop|status|reload|restart}."
exit 1
esac

324
glusterfs-system-uuid.diff Normal file
View File

@ -0,0 +1,324 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-10-05 15:16:20.783482347 +0200
Upstream: tbd
build: use system's libuuid instead
Obey thy http://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries
---
configure.ac | 4 +++-
libglusterfs/src/Makefile.am | 6 +++---
libglusterfs/src/common-utils.h | 2 +-
libglusterfs/src/iatt.h | 2 +-
libglusterfs/src/inode.h | 2 +-
xlators/features/marker/src/Makefile.am | 2 +-
xlators/features/marker/src/marker.h | 2 +-
xlators/mgmt/glusterd/src/Makefile.am | 2 +-
xlators/mgmt/glusterd/src/glusterd-op-sm.c | 2 +-
xlators/mgmt/glusterd/src/glusterd-op-sm.h | 2 +-
xlators/mgmt/glusterd/src/glusterd-pmap.h | 2 +-
xlators/mgmt/glusterd/src/glusterd-sm.c | 2 +-
xlators/mgmt/glusterd/src/glusterd-sm.h | 2 +-
xlators/mgmt/glusterd/src/glusterd-store.h | 2 +-
xlators/mgmt/glusterd/src/glusterd-utils.h | 2 +-
xlators/mgmt/glusterd/src/glusterd.c | 2 +-
xlators/mgmt/glusterd/src/glusterd.h | 2 +-
xlators/nfs/server/src/Makefile.am | 2 +-
xlators/nfs/server/src/mount3.h | 2 +-
xlators/nfs/server/src/nfs-common.h | 2 +-
xlators/nfs/server/src/nfs3-fh.h | 2 +-
21 files changed, 25 insertions(+), 23 deletions(-)
Index: glusterfs-3.2.4/configure.ac
===================================================================
--- glusterfs-3.2.4.orig/configure.ac
+++ glusterfs-3.2.4/configure.ac
@@ -340,10 +340,12 @@ AC_SUBST(SYNCDAEMON_SUBDIR)
#check if libxml is present if so enable HAVE_LIB_XML
echo -n "checking if libxml2 is present... "
+PKG_CHECK_MODULES([libuuid], [uuid])
PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6.19],
[echo "yes (features requiring libxml2 enabled)" AC_DEFINE(HAVE_LIB_XML, 1, [define if libxml2 is present])],
[echo "no"] )
+# v - this is not needed
AC_SUBST(LIBXML2_CFLAGS)
AC_SUBST(LIBXML2_LIBS)
@@ -482,7 +484,7 @@ AC_SUBST(AM_LIBTOOLFLAGS)
CONTRIBDIR='$(top_srcdir)/contrib'
AC_SUBST(CONTRIBDIR)
-INCLUDES='-I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/uuid'
+INCLUDES='-I$(top_srcdir)/libglusterfs/src'
AC_SUBST(INCLUDES)
AM_CONDITIONAL([GF_DARWIN_HOST_OS], test "${GF_HOST_OS}" = "GF_DARWIN_HOST_OS")
Index: glusterfs-3.2.4/libglusterfs/src/Makefile.am
===================================================================
--- glusterfs-3.2.4.orig/libglusterfs/src/Makefile.am
+++ glusterfs-3.2.4/libglusterfs/src/Makefile.am
@@ -1,12 +1,12 @@
-libglusterfs_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS)
+libglusterfs_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) ${libuuid_CFLAGS}
libglusterfs_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" -D$(GF_HOST_OS) -I$(CONTRIBDIR)/rbtree -DSCHEDULERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler\" -I$(CONTRIBDIR)/md5
-libglusterfs_la_LIBADD = @LEXLIB@
+libglusterfs_la_LIBADD = @LEXLIB@ ${libuuid_LIBS}
lib_LTLIBRARIES = libglusterfs.la
-libglusterfs_la_SOURCES = dict.c graph.lex.c y.tab.c xlator.c logging.c hashfn.c defaults.c common-utils.c timer.c inode.c call-stub.c compat.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c iobuf.c globals.c statedump.c stack.c checksum.c $(CONTRIBDIR)/md5/md5.c $(CONTRIBDIR)/rbtree/rb.c rbthash.c latency.c graph.c $(CONTRIBDIR)/uuid/clear.c $(CONTRIBDIR)/uuid/copy.c $(CONTRIBDIR)/uuid/gen_uuid.c $(CONTRIBDIR)/uuid/pack.c $(CONTRIBDIR)/uuid/parse.c $(CONTRIBDIR)/uuid/unparse.c $(CONTRIBDIR)/uuid/uuid_time.c $(CONTRIBDIR)/uuid/compare.c $(CONTRIBDIR)/uuid/isnull.c $(CONTRIBDIR)/uuid/unpack.c syncop.c graph-print.c trie.c daemon.c
+libglusterfs_la_SOURCES = dict.c graph.lex.c y.tab.c xlator.c logging.c hashfn.c defaults.c common-utils.c timer.c inode.c call-stub.c compat.c fd.c compat-errno.c event.c mem-pool.c gf-dirent.c syscall.c iobuf.c globals.c statedump.c stack.c checksum.c $(CONTRIBDIR)/md5/md5.c $(CONTRIBDIR)/rbtree/rb.c rbthash.c latency.c graph.c syncop.c graph-print.c trie.c daemon.c
noinst_HEADERS = common-utils.h defaults.h dict.h glusterfs.h hashfn.h logging.h xlator.h stack.h timer.h list.h inode.h call-stub.h compat.h fd.h revision.h compat-errno.h event.h mem-pool.h byte-order.h gf-dirent.h locking.h syscall.h iobuf.h globals.h statedump.h checksum.h $(CONTRIBDIR)/md5/md5.h $(CONTRIBDIR)/rbtree/rb.h rbthash.h iatt.h latency.h mem-types.h $(CONTRIBDIR)/uuid/uuidd.h $(CONTRIBDIR)/uuid/uuid.h $(CONTRIBDIR)/uuid/uuidP.h $(CONTRIBDIR)/uuid/uuid_types.h syncop.h graph-utils.h graph-mem-types.h trie.h trie-mem-types.h daemon.h
Index: glusterfs-3.2.4/libglusterfs/src/common-utils.h
===================================================================
--- glusterfs-3.2.4.orig/libglusterfs/src/common-utils.h
+++ glusterfs-3.2.4/libglusterfs/src/common-utils.h
@@ -47,7 +47,7 @@ void trap (void);
#include "glusterfs.h"
#include "locking.h"
#include "mem-pool.h"
-#include "uuid.h"
+#include <uuid/uuid.h>
#define min(a,b) ((a)<(b)?(a):(b))
Index: glusterfs-3.2.4/libglusterfs/src/iatt.h
===================================================================
--- glusterfs-3.2.4.orig/libglusterfs/src/iatt.h
+++ glusterfs-3.2.4/libglusterfs/src/iatt.h
@@ -31,7 +31,7 @@
#include <unistd.h>
#include "compat.h"
-#include "uuid.h"
+#include <uuid/uuid.h>
typedef enum {
IA_INVAL = 0,
Index: glusterfs-3.2.4/libglusterfs/src/inode.h
===================================================================
--- glusterfs-3.2.4.orig/libglusterfs/src/inode.h
+++ glusterfs-3.2.4/libglusterfs/src/inode.h
@@ -41,7 +41,7 @@ typedef struct _dentry dentry_t;
#include "list.h"
#include "xlator.h"
#include "iatt.h"
-#include "uuid.h"
+#include <uuid/uuid.h>
struct _inode_table {
Index: glusterfs-3.2.4/xlators/features/marker/src/Makefile.am
===================================================================
--- glusterfs-3.2.4.orig/xlators/features/marker/src/Makefile.am
+++ glusterfs-3.2.4/xlators/features/marker/src/Makefile.am
@@ -9,7 +9,7 @@ marker_la_LIBADD = $(top_builddir)/libgl
noinst_HEADERS = marker-mem-types.h marker.h marker-quota.h marker-quota-helper.h marker-common.h $(top_builddir)/xlators/lib/src/libxlator.h
AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -fno-strict-aliasing -D$(GF_HOST_OS) \
- -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src $(GF_CFLAGS) -shared -nostartfiles
+ -I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/xlators/lib/src $(GF_CFLAGS) -shared -nostartfiles ${libuuid_CFLAGS}
CLEANFILES =
Index: glusterfs-3.2.4/xlators/features/marker/src/marker.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/features/marker/src/marker.h
+++ glusterfs-3.2.4/xlators/features/marker/src/marker.h
@@ -27,7 +27,7 @@
#include "marker-quota.h"
#include "xlator.h"
#include "defaults.h"
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "call-stub.h"
#define MARKER_XATTR_PREFIX "trusted.glusterfs"
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/Makefile.am
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/Makefile.am
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/Makefile.am
@@ -17,7 +17,7 @@ AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64
-I$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/xdr/src\
-I$(top_srcdir)/rpc/rpc-lib/src -I$(CONTRIBDIR)/uuid -I$(top_srcdir)/contrib/md5 -DGFS_PREFIX=\"$(prefix)\" \
-DDATADIR=\"$(localstatedir)\" -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
- -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(LIBXML2_CFLAGS)
+ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(LIBXML2_CFLAGS) ${libuuid_CFLAGS}
CLEANFILES =
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-op-sm.c
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -28,7 +28,7 @@
#include <sys/mount.h>
#include <libgen.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "fnmatch.h"
#include "xlator.h"
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-op-sm.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-op-sm.h
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-op-sm.h
@@ -30,7 +30,7 @@
#endif
#include <pthread.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "glusterfs.h"
#include "xlator.h"
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-pmap.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-pmap.h
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-pmap.h
@@ -26,7 +26,7 @@
#endif
#include <pthread.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "glusterfs.h"
#include "xlator.h"
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-sm.c
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-sm.c
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-sm.c
@@ -27,7 +27,7 @@
#include <sys/resource.h>
#include <libgen.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "fnmatch.h"
#include "xlator.h"
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-sm.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-sm.h
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-sm.h
@@ -26,7 +26,7 @@
#endif
#include <pthread.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "rpc-clnt.h"
#include "glusterfs.h"
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-store.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-store.h
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-store.h
@@ -26,7 +26,7 @@
#endif
#include <pthread.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "glusterfs.h"
#include "xlator.h"
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-utils.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd-utils.h
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd-utils.h
@@ -26,7 +26,7 @@
#endif
#include <pthread.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "glusterfs.h"
#include "xlator.h"
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd.c
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd.c
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd.c
@@ -27,7 +27,7 @@
#include <sys/resource.h>
#include <libgen.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "glusterd.h"
#include "rpcsvc.h"
Index: glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/mgmt/glusterd/src/glusterd.h
+++ glusterfs-3.2.4/xlators/mgmt/glusterd/src/glusterd.h
@@ -30,7 +30,7 @@
#include <pthread.h>
#include <libgen.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
#include "rpc-clnt.h"
#include "glusterfs.h"
Index: glusterfs-3.2.4/xlators/nfs/server/src/Makefile.am
===================================================================
--- glusterfs-3.2.4.orig/xlators/nfs/server/src/Makefile.am
+++ glusterfs-3.2.4/xlators/nfs/server/src/Makefile.am
@@ -8,6 +8,6 @@ server_la_LIBADD = $(top_builddir)/libgl
noinst_HEADERS = nfs.h nfs-common.h nfs-fops.h nfs-inodes.h nfs-generics.h mount3.h nfs3-fh.h nfs3.h nfs3-helpers.h nfs-mem-types.h $(nfsrpclibdir)/xdr-rpc.h $(nfsrpclibdir)/msg-nfs3.h $(nfsrpclibdir)/xdr-common.h $(nfsrpclibdir)/xdr-nfs3.h $(nfsrpclibdir)/rpc-socket.h $(nfsrpclibdir)/rpcsvc.h
AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
-I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)\
- -I$(nfsrpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree
+ -I$(nfsrpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree ${libuuid_CFLAGS}
CLEANFILES =
Index: glusterfs-3.2.4/xlators/nfs/server/src/mount3.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/nfs/server/src/mount3.h
+++ glusterfs-3.2.4/xlators/nfs/server/src/mount3.h
@@ -34,7 +34,7 @@
#include "xdr-nfs3.h"
#include "locking.h"
#include "nfs3-fh.h"
-#include "uuid.h"
+#include <uuid/uuid.h>
/* Registered with portmap */
#define GF_MOUNTV3_PORT 38465
Index: glusterfs-3.2.4/xlators/nfs/server/src/nfs-common.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/nfs/server/src/nfs-common.h
+++ glusterfs-3.2.4/xlators/nfs/server/src/nfs-common.h
@@ -30,7 +30,7 @@
#include "xlator.h"
#include "rpcsvc.h"
#include "iatt.h"
-#include "uuid.h"
+#include <uuid/uuid.h>
//NFS_PATH_MAX hard-coded to 4096 as a work around for bug 2476.
//nfs server crashes when path received is longer than PATH_MAX
Index: glusterfs-3.2.4/xlators/nfs/server/src/nfs3-fh.h
===================================================================
--- glusterfs-3.2.4.orig/xlators/nfs/server/src/nfs3-fh.h
+++ glusterfs-3.2.4/xlators/nfs/server/src/nfs3-fh.h
@@ -29,7 +29,7 @@
#include "xdr-nfs3.h"
#include "iatt.h"
#include <sys/types.h>
-#include "uuid.h"
+#include <uuid/uuid.h>
/* BIG FAT WARNING: The file handle code is tightly coupled to NFSv3 file
* handles for now. This will change if and when we need v4. */

187
glusterfs.spec Normal file
View File

@ -0,0 +1,187 @@
#
# spec file for package glusterfs
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: glusterfs
%define lname_rpc libgfrpc0
%define lname_xdr libgfxdr0
%define lname_gf libglusterfs0
Version: 3.2.4
Release: 0
Group: System/Filesystems
Summary: Aggregating distributed file system
License: AGPL-3.0, GPL-2.0+
URL: http://gluster.org/
Source: %name-%version.tar.xz
Patch1: glusterfs-init.diff
Patch2: glusterfs-date.diff
Patch3: glusterfs-system-uuid.diff
BuildRoot: %_tmppath/%name-%version-build
BuildRequires: bison, fdupes, flex, fuse-devel >= 2.6.5, pkgconfig
BuildRequires: pkgconfig(libxml-2.0), pkgconfig(uuid)
BuildRequires: python, readline-devel, xz
Requires: python
%description
GlusterFS is a clustered file-system capable of scaling to several
petabytes. It aggregates various storage bricks over Infiniband RDMA
or TCP/IP interconnect into one large parallel network file system.
GlusterFS is one of the most sophisticated file systems in terms of
features and extensibility. It borrows a powerful concept called
Translators from GNU Hurd kernel. Much of the code in GlusterFS is in
user space and easily manageable.
%package -n %lname_rpc
Summary: GlusterFS Remote Procedure Call library
Group: System/Libraries
%description -n %lname_rpc
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package -n %lname_xdr
Summary: GlusterFS's External Data Representation library
Group: System/Libraries
%description -n %lname_xdr
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package -n %lname_gf
Summary: GlusterFS's core library
Group: System/Libraries
%description -n %lname_gf
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
%package devel
Summary: Development files for glusterfs
Group: Development/Libraries/C and C++
%description devel
GlusterFS is a clustered file-system capable of scaling to several
petabytes.
This package provides development files such as headers and library
links.
%prep
%setup -q
%patch -P 1 -P 2 -P 3 -p1
%build
./autogen.sh;
%configure --disable-static
# This section is not parallel safe or so due to bison/lex
make -C libglusterfs/src
make %{?_smp_mflags};
%install
b="%buildroot";
%make_install docdir=%_docdir/%name
mkdir -p "$b/%_localstatedir/log"/{glusterd,glusterfs,glusterfsd};
# The things seemingly forgotten by make install.
# - Manually populate devel dirs
mkdir -p "$b/%_includedir/%name";
install -pm0644 libglusterfs/src/*.h "$b/%_includedir/%name/";
# - hekafs wants this:
mkdir -p "$b/%_includedir/%name"/{rpc,server};
install -pm0644 rpc/rpc-lib/src/*.h rpc/xdr/src/*.h \
"$b/%_includedir/%name/rpc/";
install -pm0644 xlators/protocol/server/src/*.h \
"$b/%_includedir/%name/server/";
# - init script; there is no SuSE-release in the build env
mkdir -p "$b/%_initrddir";
install -pm0755 extras/init.d/glusterd-SuSE "$b/%_initrddir/glusterd";
# - wrapper umount script?
# - logrotate entry
mkdir -p "$b/%_localstatedir/log/%name";
# - vim syntax
# - state
mkdir -p "$b/%_localstatedir/lib/glusterd";
perl -i -pe \
's{^(\s*option working-directory )\S+}{$1 %_localstatedir/lib/glusterd}g' \
"$b/%_sysconfdir/%name/glusterd.vol";
# Clean, but must NOT remove .la from dirs not searched by
# default, thus maxdepth.
find "$b/%_libdir" -maxdepth 1 -type f -name "*.la" -delete;
# W: wrong-file-end-of-line-encoding
perl -i -pe 's{\x0d\x0a}{\x0a}gs' %_docdir/%name/glusterfs-mode.el;
%fdupes %buildroot
%post
/sbin/ldconfig
%insserv_cleanup
%restart_on_update glusterd
%preun
%stop_on_removal glusterd
%postun
/sbin/ldconfig
%insserv_cleanup
%post -n %lname_rpc -p /sbin/ldconfig
%postun -n %lname_rpc -p /sbin/ldconfig
%post -n %lname_xdr -p /sbin/ldconfig
%postun -n %lname_xdr -p /sbin/ldconfig
%post -n %lname_gf -p /sbin/ldconfig
%postun -n %lname_gf -p /sbin/ldconfig
%files
%defattr(-,root,root)
%_initrddir/glusterd
%dir %_sysconfdir/%name
%config(noreplace) %_sysconfdir/%name/glusterd.vol
%config %_sysconfdir/%name/*.sample
/sbin/mount.%name
%_libexecdir/%name
%_libdir/%name
%_sbindir/gluster*
%_mandir/man*/*
%_docdir/%name
%_localstatedir/lib/glusterd
%_localstatedir/log/%name
%files -n %lname_rpc
%defattr(-,root,root)
%_libdir/libgfrpc.so.0*
%files -n %lname_xdr
%defattr(-,root,root)
%_libdir/libgfxdr.so.0*
%files -n %lname_gf
%defattr(-,root,root)
%_libdir/libglusterfs.so.0*
%files devel
%defattr(-,root,root)
%_includedir/%name
%_libdir/*.so