diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-03-27 16:09:56 -0400 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-04-28 14:08:41 +0000 |
| commit | 83abcba6b42f94eb5a6495a634d4055362a9d79d (patch) | |
| tree | 401e7638258acf9ef4c04af00a0bbfc443b570e3 /extras | |
| parent | ab88f655e6423f51e2f2fac9265ff4d4f5c3e579 (diff) | |
build: conditionally build legacy gNFS server and associated sub-packaging
Plus some additional logic in glusterd to ensure gnfs (glusterfs)
daemons are never started if server/nfs xlator is not installed.
As a service, nfs is still initialized. The glusterfs-gnfs RPM
may be installed or uninstalled independent of anything else,
including on a system where gluster is actively running, so the
existence of the xlator is always tested before trying to start
gnfs.
Change-Id: I56743ad1cb36a84917226d7d26cb9d015d441e66
BUG: 1326219
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/16958
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/LinuxRPM/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extras/LinuxRPM/Makefile.am b/extras/LinuxRPM/Makefile.am index 61fd6da74c8..f02853798c0 100644 --- a/extras/LinuxRPM/Makefile.am +++ b/extras/LinuxRPM/Makefile.am @@ -18,7 +18,7 @@ autogen: cd ../.. && \ rm -rf autom4te.cache && \ ./autogen.sh && \ - ./configure --with-previous-options + ./configure --enable-gnfs --with-previous-options prep: $(MAKE) -C ../.. dist; @@ -36,7 +36,7 @@ srcrpm: mv rpmbuild/SRPMS/* . rpms: - rpmbuild --define '_topdir $(shell pwd)/rpmbuild' -bb rpmbuild/SPECS/glusterfs.spec + rpmbuild --define '_topdir $(shell pwd)/rpmbuild' --with gnfs -bb rpmbuild/SPECS/glusterfs.spec mv rpmbuild/RPMS/*/* . # EPEL-5 does not like new versions of rpmbuild and requires some |