diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-03-19 13:12:02 +0100 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-03-19 07:46:52 -0700 |
| commit | 61489c1725f048c2e34a08e73f0ab367bbf673c1 (patch) | |
| tree | b7ceba0f2c3a31e1bc37c16431d6684558955cb5 | |
| parent | d06692d1deec425f74747e2c463e56f7eca981c8 (diff) | |
build: correctly install the snap_scheduler tools
The current way of installing the snap-scheduler tools breaks the
building of RPMs. The tools should be installed in /usr/sbin and there
is no need to change the attributes/permissions after the installation.
Change-Id: I1b8e206748617fb000d956b1b5da52d126971c29
BUG: 1203557
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/9939
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | extras/snap_scheduler/Makefile.am | 2 | ||||
| -rw-r--r-- | glusterfs.spec.in | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/extras/snap_scheduler/Makefile.am b/extras/snap_scheduler/Makefile.am index 24aa8241727..896595f1504 100644 --- a/extras/snap_scheduler/Makefile.am +++ b/extras/snap_scheduler/Makefile.am @@ -1,4 +1,4 @@ -snap_schedulerdir = $(DESTDIR)$(sbindir)/ +snap_schedulerdir = $(sbindir)/ snap_scheduler_SCRIPTS = gcron.py snap_scheduler.py diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 78970964172..8132de86639 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -1042,6 +1042,11 @@ fi %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs* %{_sharedstatedir}/glusterd + +#snap_scheduler +%{_sbindir}/snap_scheduler.py +%{_sbindir}/gcron.py + #hookscripts %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1 @@ -1054,9 +1059,6 @@ fi %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/post %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre -#snap_scheduler -install -p -m 0744 extras/snap_scheduler/snap_scheduler.py %{_sbindir}/ -install -p -m 0744 extras/snap_scheduler/gcron.py %{_sbindir}/ %ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options |