diff options
| author | Niels de Vos <ndevos@redhat.com> | 2012-11-06 10:13:07 +0100 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-12-12 10:58:45 -0800 |
| commit | 06d4cced24f9854e3439f03a0c940adc5306de48 (patch) | |
| tree | 62f967cad18e85f5c35c106957bd1277af100f95 /extras | |
| parent | 6d58cb0476dc13198596603a9efd5014ebcb0c45 (diff) | |
build: include OCF resource agents by default and package them
This change introduces a glusterfs-resource-agents sub-package that
contains the Open Cluster Framework (OCF) Resource Agents (RA). It also
changes the build infrastructure to include the RA by default, making
them available for anyone who is interested in using them with a OCF
compatible Hight-Availability solution like Pacemaker.
Build the RPMs without RA:
$ make dist && rpmbuild -ta --without ocf *.gz
Build the RPMs with RA (default):
$ make dist && rpmbuild -ta *.gz
There is no need to run ./autogen.sh from within the .spec, the whole
autotools infrastructure is included in the 'make dist' tarball already.
This also adds a test-case which builds the rpms with mock for the
latest two EPEL releases.
Change-Id: I12ef5f30f466868825352376156fb4e56b135c58
BUG: 869559
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/4130
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/Makefile.am | 2 | ||||
| -rw-r--r-- | extras/ocf/Makefile.am | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/extras/Makefile.am b/extras/Makefile.am index 9f2237a2f..47ace72e5 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -3,7 +3,7 @@ docdir = $(datadir)/doc/glusterfs/ EditorModedir = $(docdir)/ EditorMode_DATA = glusterfs-mode.el glusterfs.vim -SUBDIRS = init.d benchmarking hook-scripts ocf +SUBDIRS = init.d benchmarking hook-scripts $(OCF_SUBDIR) confdir = $(sysconfdir)/glusterfs conf_DATA = glusterfs-logrotate diff --git a/extras/ocf/Makefile.am b/extras/ocf/Makefile.am index 2d7410099..c49a835fb 100644 --- a/extras/ocf/Makefile.am +++ b/extras/ocf/Makefile.am @@ -1,6 +1,5 @@ EXTRA_DIST = glusterd.in volume.in -if WITH_OCF # The root of the OCF resource agent hierarchy # Per the OCF standard, it's always "lib", # not "lib64" (even on 64-bit platforms). @@ -10,4 +9,3 @@ ocfdir = $(prefix)/lib/ocf radir = $(ocfdir)/resource.d/$(PACKAGE_NAME) ra_SCRIPTS = glusterd volume -endif |