diff options
| author | Niels de Vos <ndevos@redhat.com> | 2018-01-31 16:38:34 +0100 | 
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-02-19 17:38:55 +0000 | 
| commit | 8d9961e63786cf8a9bb9e2f4140ab9a77f1ccbe3 (patch) | |
| tree | cb85d5508fcd92389e4783ec2cbee0abff36153b /extras | |
| parent | 134c539e79f96691622ed15debaeace2071c6937 (diff) | |
build: add --without-server option
With Gluster 4.0 we will not provide the server components for EL6 and
older. At one point Gluster 4.x will get GlusterD2, which requires
Golang tools in the distribution. EL6 does not contain these at the
moment.
With this change, it is possible to `./configure --without-server` which
prevents building glusterd and the xlators for the bricks. Building RPMs
can pass `--without server` and the glusterfs-server sub-package will
not be created.
Change-Id: I97f5ccf9f2c76e60d9af83915fc59fae57ad6d25
BUG: 1074947
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/Makefile.am | 26 | ||||
| -rw-r--r-- | extras/firewalld/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/hook-scripts/add-brick/post/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/hook-scripts/add-brick/pre/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/hook-scripts/create/post/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/hook-scripts/delete/pre/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/hook-scripts/set/post/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/hook-scripts/start/post/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/hook-scripts/stop/pre/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/init.d/Makefile.am | 3 | ||||
| -rw-r--r-- | extras/snap_scheduler/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/systemd/Makefile.am | 2 | 
12 files changed, 43 insertions, 6 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am index b220e15e0db..e827dde0bd9 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -1,8 +1,11 @@  addonexecdir = $(GLUSTERFS_LIBEXECDIR) -addonexec_SCRIPTS = peer_add_secret_pub +addonexec_SCRIPTS = +if WITH_SERVER +addonexec_SCRIPTS += peer_add_secret_pub  if USE_SYSTEMD  addonexec_SCRIPTS += mount-shared-storage.sh  endif +endif  EditorModedir = $(docdir)  EditorMode_DATA = glusterfs-mode.el glusterfs.vim @@ -11,27 +14,39 @@ SUBDIRS = init.d systemd benchmarking hook-scripts $(OCF_SUBDIR) LinuxRPM \            $(GEOREP_EXTRAS_SUBDIR) snap_scheduler firewalld cliutils  confdir = $(sysconfdir)/glusterfs +if WITH_SERVER  conf_DATA = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \  	logger.conf.example glusterfs-georep-logrotate group-virt.example group-metadata-cache group-gluster-block group-nl-cache +endif  voldir = $(sysconfdir)/glusterfs +if WITH_SERVER  vol_DATA = glusterd.vol +endif +  scriptsdir = $(datadir)/glusterfs/scripts -scripts_SCRIPTS = post-upgrade-script-for-quota.sh \ +scripts_SCRIPTS = +if WITH_SERVER +scripts_SCRIPTS += post-upgrade-script-for-quota.sh \  	pre-upgrade-script-for-quota.sh stop-all-gluster-processes.sh  if USE_SYSTEMD  scripts_SCRIPTS += control-cpu-load.sh  scripts_SCRIPTS += control-mem.sh  endif +endif -EXTRA_DIST = $(conf_DATA) specgen.scm glusterfs-mode.el glusterfs.vim \ -	migrate-unify-to-distribute.sh backend-xattr-sanitize.sh backend-cleanup.sh \ -	disk_usage_sync.sh clear_xattrs.sh glusterd-sysconfig glusterd.vol \ +EXTRA_DIST = glusterfs-logrotate gluster-rsyslog-7.2.conf gluster-rsyslog-5.8.conf \ +	logger.conf.example glusterfs-georep-logrotate group-virt.example \ +	group-metadata-cache group-gluster-block group-nl-cache specgen.scm \ +	glusterfs-mode.el glusterfs.vim migrate-unify-to-distribute.sh \ +	backend-xattr-sanitize.sh backend-cleanup.sh disk_usage_sync.sh \ +	clear_xattrs.sh glusterd-sysconfig glusterd.vol \  	post-upgrade-script-for-quota.sh pre-upgrade-script-for-quota.sh \  	command-completion/gluster.bash command-completion/Makefile \  	command-completion/README stop-all-gluster-processes.sh clang-checker.sh \  	mount-shared-storage.sh control-cpu-load.sh control-mem.sh +if WITH_SERVER  install-data-local:  	if [ -n "$(tmpfilesdir)" ]; then \  		$(mkdir_p) $(DESTDIR)$(tmpfilesdir); \ @@ -47,3 +62,4 @@ install-data-local:  		$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/gluster-block  	$(INSTALL_DATA) $(top_srcdir)/extras/group-nl-cache \  		$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/nl-cache +endif diff --git a/extras/firewalld/Makefile.am b/extras/firewalld/Makefile.am index a5c11b0b783..530881fb8eb 100644 --- a/extras/firewalld/Makefile.am +++ b/extras/firewalld/Makefile.am @@ -1,6 +1,8 @@  EXTRA_DIST = glusterfs.xml  if USE_FIREWALLD +if WITH_SERVER  staticdir = /usr/lib/firewalld/services/  static_DATA = glusterfs.xml  endif +endif diff --git a/extras/hook-scripts/add-brick/post/Makefile.am b/extras/hook-scripts/add-brick/post/Makefile.am index 5ca5a669de9..c1fcf50f05f 100644 --- a/extras/hook-scripts/add-brick/post/Makefile.am +++ b/extras/hook-scripts/add-brick/post/Makefile.am @@ -1,4 +1,6 @@  EXTRA_DIST = disabled-quota-root-xattr-heal.sh  hookdir = $(GLUSTERD_WORKDIR)/hooks/1/add-brick/post/ +if WITH_SERVER  hook_SCRIPTS = disabled-quota-root-xattr-heal.sh +endif diff --git a/extras/hook-scripts/add-brick/pre/Makefile.am b/extras/hook-scripts/add-brick/pre/Makefile.am index 6329ad1d4bd..3288581aa57 100644 --- a/extras/hook-scripts/add-brick/pre/Makefile.am +++ b/extras/hook-scripts/add-brick/pre/Makefile.am @@ -1,4 +1,6 @@  EXTRA_DIST = S28Quota-enable-root-xattr-heal.sh  hookdir = $(GLUSTERD_WORKDIR)/hooks/1/add-brick/pre/ +if WITH_SERVER  hook_SCRIPTS = S28Quota-enable-root-xattr-heal.sh +endif diff --git a/extras/hook-scripts/create/post/Makefile.am b/extras/hook-scripts/create/post/Makefile.am index adbce78d249..fd1892e9589 100644 --- a/extras/hook-scripts/create/post/Makefile.am +++ b/extras/hook-scripts/create/post/Makefile.am @@ -1,6 +1,8 @@  EXTRA_DIST = S10selinux-label-brick.sh  scriptsdir = $(GLUSTERD_WORKDIR)/hooks/1/create/post/ +if WITH_SERVER  if USE_SELINUX  scripts_SCRIPTS = S10selinux-label-brick.sh  endif +endif diff --git a/extras/hook-scripts/delete/pre/Makefile.am b/extras/hook-scripts/delete/pre/Makefile.am index bf0eabe255c..4fbfbe7311f 100644 --- a/extras/hook-scripts/delete/pre/Makefile.am +++ b/extras/hook-scripts/delete/pre/Makefile.am @@ -1,6 +1,8 @@  EXTRA_DIST = S10selinux-del-fcontext.sh  scriptsdir = $(GLUSTERD_WORKDIR)/hooks/1/delete/pre/ +if WITH_SERVER  if USE_SELINUX  scripts_SCRIPTS = S10selinux-del-fcontext.sh  endif +endif diff --git a/extras/hook-scripts/set/post/Makefile.am b/extras/hook-scripts/set/post/Makefile.am index cea579cb2d9..506a25a8666 100644 --- a/extras/hook-scripts/set/post/Makefile.am +++ b/extras/hook-scripts/set/post/Makefile.am @@ -1,4 +1,6 @@  EXTRA_DIST = S30samba-set.sh S32gluster_enable_shared_storage.sh  hookdir = $(GLUSTERD_WORKDIR)/hooks/1/set/post/ +if WITH_SERVER  hook_SCRIPTS = $(EXTRA_DIST) +endif diff --git a/extras/hook-scripts/start/post/Makefile.am b/extras/hook-scripts/start/post/Makefile.am index 384a5822a0c..e32546dc999 100644 --- a/extras/hook-scripts/start/post/Makefile.am +++ b/extras/hook-scripts/start/post/Makefile.am @@ -1,4 +1,6 @@  EXTRA_DIST = S29CTDBsetup.sh S30samba-start.sh  hookdir = $(GLUSTERD_WORKDIR)/hooks/1/start/post/ +if WITH_SERVER  hook_SCRIPTS = $(EXTRA_DIST) +endif diff --git a/extras/hook-scripts/stop/pre/Makefile.am b/extras/hook-scripts/stop/pre/Makefile.am index bf63e7393d3..9e8d1565e93 100644 --- a/extras/hook-scripts/stop/pre/Makefile.am +++ b/extras/hook-scripts/stop/pre/Makefile.am @@ -1,4 +1,6 @@  EXTRA_DIST =  S29CTDB-teardown.sh S30samba-stop.sh  hookdir = $(GLUSTERD_WORKDIR)/hooks/1/stop/pre/ +if WITH_SERVER  hook_SCRIPTS = $(EXTRA_DIST) +endif diff --git a/extras/init.d/Makefile.am b/extras/init.d/Makefile.am index a9ac3b42d84..25f9145f120 100644 --- a/extras/init.d/Makefile.am +++ b/extras/init.d/Makefile.am @@ -10,11 +10,12 @@ SYSTEMD_DIR = @systemddir@  LAUNCHD_DIR = @launchddir@  $(GF_DISTRIBUTION): +if WITH_SERVER  	@if [ ! -d $(SYSTEMD_DIR) ]; then \  		$(mkdir_p) $(DESTDIR)$(INIT_DIR); \  		$(INSTALL_PROGRAM) glusterd-$(GF_DISTRIBUTION) $(DESTDIR)$(INIT_DIR)/glusterd; \  	fi - +endif  if BUILD_EVENTS  	@if [ ! -d $(SYSTEMD_DIR) ]; then \  		$(mkdir_p) $(DESTDIR)$(INIT_DIR); \ diff --git a/extras/snap_scheduler/Makefile.am b/extras/snap_scheduler/Makefile.am index ffc157935a3..782f139016f 100644 --- a/extras/snap_scheduler/Makefile.am +++ b/extras/snap_scheduler/Makefile.am @@ -1,6 +1,8 @@  snap_schedulerdir = $(sbindir)/ +if WITH_SERVER  snap_scheduler_SCRIPTS = gcron.py snap_scheduler.py conf.py +endif  EXTRA_DIST = gcron.py snap_scheduler.py conf.py diff --git a/extras/systemd/Makefile.am b/extras/systemd/Makefile.am index 3988b40bce6..d4a3d0bf878 100644 --- a/extras/systemd/Makefile.am +++ b/extras/systemd/Makefile.am @@ -1,6 +1,7 @@  CLEANFILES = glusterd.service glustereventsd.service glusterfssharedstorage.service  EXTRA_DIST = glusterd.service.in glustereventsd.service.in glusterfssharedstorage.service.in +if WITH_SERVER  if USE_SYSTEMD  # systemddir is already defined through configure.ac  systemd_DATA = glusterd.service glusterfssharedstorage.service @@ -9,3 +10,4 @@ if BUILD_EVENTS  systemd_DATA += glustereventsd.service  endif  endif +endif  | 
