[SCM] CTDB repository - branch master updated - ctdb-2.3-2-g5740155
Amitay Isaacs
amitay at samba.org
Wed Jul 17 20:10:25 MDT 2013
The branch, master has been updated
via 5740155cc5de1a223412e8529aa1a383a5412514 (commit)
via 67c227a5d30cb8487b20b19b20bdfa4613906609 (commit)
from 412bc0e20bef694d4e911dc9c984fd7716231f1f (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5740155cc5de1a223412e8529aa1a383a5412514
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Jul 16 12:53:16 2013 +1000
packaging: Bundle debug_locks.sh script in RPM
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
commit 67c227a5d30cb8487b20b19b20bdfa4613906609
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Jul 16 12:52:00 2013 +1000
packaging: No need to check for existence of scripts, they always do
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
Makefile.in | 7 ++++---
packaging/RPM/ctdb.spec.in | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/Makefile.in b/Makefile.in
index 678141f..620ed84 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -389,10 +389,11 @@ install: all manpages $(PMDA_INSTALL)
if [ -f doc/onnode.1 ];then ${INSTALLCMD} -m 644 doc/onnode.1 $(DESTDIR)$(mandir)/man1; fi
if [ -f doc/ltdbtool.1 ]; then ${INSTALLCMD} -m 644 doc/ltdbtool.1 $(DESTDIR)$(mandir)/man1; fi
if [ -f doc/ping_pong.1 ];then ${INSTALLCMD} -m 644 doc/ping_pong.1 $(DESTDIR)$(mandir)/man1; fi
- if [ ! -f $(DESTDIR)$(etcdir)/ctdb/notify.sh ];then ${INSTALLCMD} -m 755 config/notify.sh $(DESTDIR)$(etcdir)/ctdb; fi
+ ${INSTALLCMD} -m 755 config/notify.sh $(DESTDIR)$(etcdir)/ctdb
${INSTALLCMD} -m 755 config/debug-hung-script.sh $(DESTDIR)$(etcdir)/ctdb
- if [ ! -f $(DESTDIR)$(etcdir)/ctdb/ctdb-crash-cleanup.sh ];then ${INSTALLCMD} -m 755 config/ctdb-crash-cleanup.sh $(DESTDIR)$(etcdir)/ctdb; fi
- if [ ! -f $(DESTDIR)$(etcdir)/ctdb/gcore_trace.sh ];then ${INSTALLCMD} -m 755 config/gcore_trace.sh $(DESTDIR)$(etcdir)/ctdb; fi
+ ${INSTALLCMD} -m 755 config/ctdb-crash-cleanup.sh $(DESTDIR)$(etcdir)/ctdb
+ ${INSTALLCMD} -m 755 config/gcore_trace.sh $(DESTDIR)$(etcdir)/ctdb
+ ${INSTALLCMD} -m 755 config/debug_locks.sh $(DESTDIR)$(etcdir)/ctdb
install_pmda:
$(INSTALLCMD) -m 755 -d $(DESTDIR)$(PMDA_DEST_DIR)
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index b87ba0b..62fc65f 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -149,6 +149,7 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/ctdb/debug-hung-script.sh
%config(noreplace) %{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
%config(noreplace) %{_sysconfdir}/ctdb/gcore_trace.sh
+%config(noreplace) %{_sysconfdir}/ctdb/debug_locks.sh
%if %{with_systemd}
%{_unitdir}/ctdb.service
--
CTDB repository
More information about the samba-cvs
mailing list