summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorvmallika <vmallika@redhat.com>2016-01-29 12:20:59 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-02-03 22:11:08 -0800
commit61c2aec3034714e513bcc3ad9ea61c2bb63b07fe (patch)
tree3760e13bc77edc184739e3f83d9000cd2bbc8e7a /extras
parent8d4c9532086222bfbb7a6d48f9f9c01e58b4dcf3 (diff)
build: use 'make install' to install the hook scripts
This is a backport of http://review.gluster.org/#/c/13072 The installation should be the same on all distributions, and doing manual installation of files in the .spec is very ugly. This change adds the rules so that 'make install' places the hook scripts in the right location. Also, the hook script(s) for NFS-Ganesha should be part of the glusterfs-ganesha sub-package and got moved there. > BUG: 1174765 > Change-Id: Iba25a7a5112c7d40db4c10ff4a5ac7a5fb4f7c4e > Signed-off-by: Niels de Vos <ndevos@redhat.com> > Reviewed-on: http://review.gluster.org/13072 > Tested-by: Gluster Build System <jenkins@build.gluster.com> > Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Change-Id: I8fade7e9e540eedc1e619f116d356a2b26f599a9 BUG: 1302955 Signed-off-by: vmallika <vmallika@redhat.com> Reviewed-on: http://review.gluster.org/13313 Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/hook-scripts/add-brick/post/Makefile.am3
-rw-r--r--extras/hook-scripts/add-brick/pre/Makefile.am3
-rw-r--r--extras/hook-scripts/reset/post/Makefile.am3
-rw-r--r--extras/hook-scripts/set/post/Makefile.am3
-rw-r--r--extras/hook-scripts/start/post/Makefile.am3
-rw-r--r--extras/hook-scripts/stop/pre/Makefile.am3
6 files changed, 18 insertions, 0 deletions
diff --git a/extras/hook-scripts/add-brick/post/Makefile.am b/extras/hook-scripts/add-brick/post/Makefile.am
index 12f5102..5ca5a66 100644
--- a/extras/hook-scripts/add-brick/post/Makefile.am
+++ b/extras/hook-scripts/add-brick/post/Makefile.am
@@ -1 +1,4 @@
EXTRA_DIST = disabled-quota-root-xattr-heal.sh
+
+hookdir = $(GLUSTERD_WORKDIR)/hooks/1/add-brick/post/
+hook_SCRIPTS = disabled-quota-root-xattr-heal.sh
diff --git a/extras/hook-scripts/add-brick/pre/Makefile.am b/extras/hook-scripts/add-brick/pre/Makefile.am
index 4d22d3c..6329ad1 100644
--- a/extras/hook-scripts/add-brick/pre/Makefile.am
+++ b/extras/hook-scripts/add-brick/pre/Makefile.am
@@ -1 +1,4 @@
EXTRA_DIST = S28Quota-enable-root-xattr-heal.sh
+
+hookdir = $(GLUSTERD_WORKDIR)/hooks/1/add-brick/pre/
+hook_SCRIPTS = S28Quota-enable-root-xattr-heal.sh
diff --git a/extras/hook-scripts/reset/post/Makefile.am b/extras/hook-scripts/reset/post/Makefile.am
index fcdd8ab..bb28d99 100644
--- a/extras/hook-scripts/reset/post/Makefile.am
+++ b/extras/hook-scripts/reset/post/Makefile.am
@@ -1 +1,4 @@
EXTRA_DIST = S31ganesha-reset.sh
+
+hookdir = $(GLUSTERD_WORKDIR)/hooks/1/reset/post/
+hook_SCRIPTS = S31ganesha-reset.sh
diff --git a/extras/hook-scripts/set/post/Makefile.am b/extras/hook-scripts/set/post/Makefile.am
index db86bc2..cea579c 100644
--- a/extras/hook-scripts/set/post/Makefile.am
+++ b/extras/hook-scripts/set/post/Makefile.am
@@ -1 +1,4 @@
EXTRA_DIST = S30samba-set.sh S32gluster_enable_shared_storage.sh
+
+hookdir = $(GLUSTERD_WORKDIR)/hooks/1/set/post/
+hook_SCRIPTS = $(EXTRA_DIST)
diff --git a/extras/hook-scripts/start/post/Makefile.am b/extras/hook-scripts/start/post/Makefile.am
index ad53233..03bb300 100644
--- a/extras/hook-scripts/start/post/Makefile.am
+++ b/extras/hook-scripts/start/post/Makefile.am
@@ -1 +1,4 @@
EXTRA_DIST = S29CTDBsetup.sh S30samba-start.sh S31ganesha-start.sh
+
+hookdir = $(GLUSTERD_WORKDIR)/hooks/1/start/post/
+hook_SCRIPTS = $(EXTRA_DIST)
diff --git a/extras/hook-scripts/stop/pre/Makefile.am b/extras/hook-scripts/stop/pre/Makefile.am
index 85243ad..bf63e73 100644
--- a/extras/hook-scripts/stop/pre/Makefile.am
+++ b/extras/hook-scripts/stop/pre/Makefile.am
@@ -1 +1,4 @@
EXTRA_DIST = S29CTDB-teardown.sh S30samba-stop.sh
+
+hookdir = $(GLUSTERD_WORKDIR)/hooks/1/stop/pre/
+hook_SCRIPTS = $(EXTRA_DIST)