Skip to content

Commit

Permalink
build: correctly install the snap_scheduler tools
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
nixpanic authored and vbellur committed Mar 19, 2015
1 parent d06692d commit 61489c1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion extras/snap_scheduler/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
snap_schedulerdir = $(DESTDIR)$(sbindir)/
snap_schedulerdir = $(sbindir)/

snap_scheduler_SCRIPTS = gcron.py snap_scheduler.py

Expand Down
8 changes: 5 additions & 3 deletions glusterfs.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 61489c1

Please sign in to comment.