diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-06-18 00:21:59 +0200 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-08-25 08:50:55 -0700 |
| commit | 55b44094436bc8630b6c3ff2d232e6551d40630c (patch) | |
| tree | dff3f88c49ab1eddf9c61c051381f158c57bf13a | |
| parent | 130697b8b706432153d9a0fda49b896065289aaa (diff) | |
rpm: include required directory for glusterfind
The directory was marked as %ghost, which causes the following
installation failure:
Error unpacking rpm package glusterfs-server-3.8dev-0.446.git45e13fe.el7.centos.x86_64
error: unpacking of archive failed on file /var/lib/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py;5581f20e: cpio: open
Also, *all* Python files should be part of the RPM package. This
includes generated .pyc and .pyo files.
BUG: 1256307
Change-Id: Iee74905b101912c4a845257742c470c3fe42ce2a
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/11298
Reviewed-on: http://review.gluster.org/12000
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | extras/hook-scripts/Makefile.am | 6 | ||||
| -rw-r--r-- | glusterfs.spec.in | 7 | ||||
| -rw-r--r-- | tools/glusterfind/Makefile.am | 12 | ||||
| -rwxr-xr-x | tools/glusterfind/S57glusterfind-delete-post.py (renamed from extras/hook-scripts/S57glusterfind-delete-post.py) | 0 |
4 files changed, 16 insertions, 9 deletions
diff --git a/extras/hook-scripts/Makefile.am b/extras/hook-scripts/Makefile.am index f291261d123..771b37e3fdf 100644 --- a/extras/hook-scripts/Makefile.am +++ b/extras/hook-scripts/Makefile.am @@ -1,11 +1,7 @@ -EXTRA_DIST = S40ufo-stop.py S56glusterd-geo-rep-create-post.sh \ - S57glusterfind-delete-post.py +EXTRA_DIST = S40ufo-stop.py S56glusterd-geo-rep-create-post.sh SUBDIRS = add-brick set start stop reset scriptsdir = $(GLUSTERD_WORKDIR)/hooks/1/gsync-create/post/ if USE_GEOREP scripts_SCRIPTS = S56glusterd-geo-rep-create-post.sh endif - -deletehookscriptsdir = $(GLUSTERD_WORKDIR)/hooks/1/delete/post/ -deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py diff --git a/glusterfs.spec.in b/glusterfs.spec.in index c6c61204306..fb45049d05d 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1212,7 +1212,7 @@ fi %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post + %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols @@ -1230,11 +1230,12 @@ fi %{_bindir}/glusterfind %{_libexecdir}/glusterfs/peer_add_secret_pub %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py -%exclude %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.pyc -%exclude %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.pyo %changelog +* Tue Aug 18 2015 Niels de Vos <ndevos@redhat.com> +- Include missing directories for glusterfind hooks scripts (#1225465) + * Mon Jun 15 2015 Niels de Vos <ndevos@redhat.com> - Replace hook script S31ganesha-set.sh by S31ganesha-start.sh (#1231738) diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am index c5a05d61061..514c37c14ad 100644 --- a/tools/glusterfind/Makefile.am +++ b/tools/glusterfind/Makefile.am @@ -1,10 +1,20 @@ SUBDIRS = src -EXTRA_DIST = +EXTRA_DIST = S57glusterfind-delete-post.py bin_SCRIPTS = glusterfind CLEANFILES = $(bin_SCRIPTS) +deletehookscriptsdir = $(libexecdir)/glusterfs/glusterfind/ +deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py + +uninstall-local: + rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py + install-data-local: $(MKDIR_P) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys + $(MKDIR_P) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/ + rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py + ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \ + $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post.py diff --git a/extras/hook-scripts/S57glusterfind-delete-post.py b/tools/glusterfind/S57glusterfind-delete-post.py index 70edb563320..70edb563320 100755 --- a/extras/hook-scripts/S57glusterfind-delete-post.py +++ b/tools/glusterfind/S57glusterfind-delete-post.py |