summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2009-11-04 01:23:18 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-11-11 23:18:19 -0800
commitef078a335980b5962239556e9b3a98f589662337 (patch)
tree9ef2188e8ce37210e4ab2dee6a269e1b599829b7
parente98020d5f6f2f22f09d2c21d80ad8ceb6ae46284 (diff)
Add glusterfs-volgen to master, change fusermount options and other changes to rpm spec file.
The patch has the following changes: * Rename glusterfs-volgen.py and include it in the rpm spec file * Enable fusermount by default. Change fusermount configure option from disable to enable. * Remove BDB from configure.ac, essentially removing it from the normal build. * Remove all dependencies on fuse in the rpm spec file. Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 343 (Placeholder bug for adding volgen into rpm, bdb makefile changes, etc) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=343
-rw-r--r--configure.ac7
-rw-r--r--extras/Makefile.am6
-rw-r--r--extras/glusterfs-volgen (renamed from extras/glusterfs-volgen.py)0
-rw-r--r--glusterfs.spec.in16
-rw-r--r--xlators/storage/Makefile.am2
5 files changed, 17 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index df43b80779d..3069f35942e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,6 @@ AC_CONFIG_FILES([Makefile
xlators/storage/Makefile
xlators/storage/posix/Makefile
xlators/storage/posix/src/Makefile
- xlators/storage/bdb/Makefile
- xlators/storage/bdb/src/Makefile
xlators/cluster/Makefile
xlators/cluster/unify/Makefile
xlators/cluster/unify/src/Makefile
@@ -228,9 +226,8 @@ AC_SUBST(FUSE_CLIENT_SUBDIR)
# FUSERMOUNT section
AC_ARG_ENABLE([fusermount],
- AC_HELP_STRING([--enable-fusermount],
- [Build fusermount]),
- [], [enable_fusermount=no])
+ AC_HELP_STRING([--disable-fusermount],
+ [Do not build fusermount]))
BUILD_FUSERMOUNT="no"
diff --git a/extras/Makefile.am b/extras/Makefile.am
index c00cdcc0f9c..9ad0442951a 100644
--- a/extras/Makefile.am
+++ b/extras/Makefile.am
@@ -5,7 +5,11 @@ EditorMode_DATA = glusterfs-mode.el glusterfs.vim
SUBDIRS = init.d benchmarking
-EXTRA_DIST = specgen.scm MacOSX/Portfile glusterfs-mode.el glusterfs.vim migrate-unify-to-distribute.sh backend-xattr-sanitize.sh glusterfs-volgen.py
+EXTRA_DIST = specgen.scm MacOSX/Portfile glusterfs-mode.el glusterfs.vim migrate-unify-to-distribute.sh backend-xattr-sanitize.sh
+dist_bin_SCRIPTS = glusterfs-volgen
+
+install-exec-hook:
+ chmod 755 $(DESTDIR)$(bindir)/glusterfs-volgen
CLEANFILES =
diff --git a/extras/glusterfs-volgen.py b/extras/glusterfs-volgen
index 178003cdc09..178003cdc09 100644
--- a/extras/glusterfs-volgen.py
+++ b/extras/glusterfs-volgen
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 044496fcb91..7e5faa4a94a 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -7,10 +7,6 @@
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ibverbs
%{?_without_ibverbs:%define _without_ibverbs --disable-ibverbs}
-# if you wish to compile an rpm without building the client RPMs...
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without client
-%{?_without_client:%define _without_client --disable-fuse-client}
-
# if you wish to compile an rpm without BDB translator...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bdb
%{?_without_bdb:%define _without_bdb --disable-bdb}
@@ -23,6 +19,10 @@
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without epoll
%{?_without_epoll:%define _without_epoll --disable-epoll}
+# if you wish to compile an rpm without fusermount...
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without fusermount
+%{?_without_fusermount:%define _without_fusermount --disable-fusermount}
+
Summary: Cluster File System
Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
@@ -40,7 +40,6 @@ Requires(postun): /sbin/service
%{!?_without_ibverbs:BuildRequires: libibverbs-devel}
%{!?_without_bdb:BuildRequires: db4-devel}
-%{!?_without_client:BuildRequires: fuse-devel}
BuildRequires: bison flex
BuildRequires: gcc make
@@ -75,7 +74,6 @@ translator modules common to both GlusterFS server and client framework.
%package client
Summary: GlusterFS Client
Group: Applications/File
-Requires: fuse
Requires: %{name}-common = %{version}-%{release}
%description client
@@ -171,10 +169,14 @@ fi
%if 0%{!?_without_client:1}
%exclude %{_libdir}/glusterfs/%{version}/xlator/mount
%endif
+%if 0%{!?_without_fusermount:1}
+%exclude %{_bindir}/fusermount-glusterfs
+%endif
+%{_bindir}/glusterfs-volgen
%{_libdir}/glusterfs
%{_libdir}/*.so.*
%{_sbindir}/glusterfs*
-%{_mandir}/man8/glusterfs.8*
+%{_mandir}/man8/*glusterfs.8*
%dir /var/log/glusterfs
%if 0%{!?_without_client:1}
diff --git a/xlators/storage/Makefile.am b/xlators/storage/Makefile.am
index 59b9689699e..9cb9ded3035 100644
--- a/xlators/storage/Makefile.am
+++ b/xlators/storage/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = posix $(BDB_SUBDIR)
+SUBDIRS = posix
CLEANFILES =