[PATCHES] ctdb build/packaging
Michael Adam
obnox at samba.org
Fri Dec 6 05:34:23 MST 2013
On 2013-12-06 at 21:28 +1100, Martin Schwenke wrote:
> On Fri, 6 Dec 2013 07:54:22 +0100, Michael Adam <obnox at samba.org> wrote:
>
> > On 2013-12-06 at 01:49 +0100, Michael Adam wrote:
> > > Attached find three patches to ctdb/ in master.
> > > - install new manpages
> > > - package new manpages
>
> +%{_mandir}/man7/ctdbd.7.gz
>
> Should be: ctdb.7.gz
>
> + if [ -f doc/ctdbd.conf.5 ];then ${INSTALLCMD} -m 644 doc/ctdbd.conf.5 $(DESTDIR)$(mandir)/man7; fi
>
> Should be: man5
Thanks!
Fixed patchset attached.
Michael
-------------- next part --------------
From fb2315a0b46099c6e2681fabac77b844435deebc Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 6 Dec 2013 01:31:11 +0100
Subject: [PATCH 1/3] ctdb:build: install the new manpages
Signed-off-by: Michael Adam <obnox at samba.org>
---
ctdb/Makefile.in | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index eb280f2..92bd56f 100755
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -370,9 +370,15 @@ install: all manpages $(PMDA_INSTALL)
if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi
if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -m 644 doc/ctdb.1 $(DESTDIR)$(mandir)/man1; fi
if [ -f doc/ctdbd.1 ];then ${INSTALLCMD} -m 644 doc/ctdbd.1 $(DESTDIR)$(mandir)/man1; fi
+ if [ -f doc/ctdbd_wrapper.1 ];then ${INSTALLCMD} -m 644 doc/ctdbd_wrapper.1 $(DESTDIR)$(mandir)/man1; fi
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 doc/ctdb.7 ]; then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man7; fi
+ if [ -f doc/ctdb.7 ]; then ${INSTALLCMD} -m 644 doc/ctdb.7 $(DESTDIR)$(mandir)/man7; fi
+ if [ -f doc/ctdb-tunables.7 ]; then ${INSTALLCMD} -m 644 doc/ctdb-tunables.7 $(DESTDIR)$(mandir)/man7; fi
+ if [ -f doc/ctdbd.conf.5 ]; then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man5; fi
+ if [ -f doc/ctdbd.conf.5 ]; then ${INSTALLCMD} -m 644 doc/ctdbd.conf.5 $(DESTDIR)$(mandir)/man5; fi
${INSTALLCMD} -m 755 config/notify.sh $(DESTDIR)$(etcdir)/ctdb
${INSTALLCMD} -m 755 config/debug-hung-script.sh $(DESTDIR)$(etcdir)/ctdb
${INSTALLCMD} -m 755 config/ctdb-crash-cleanup.sh $(DESTDIR)$(etcdir)/ctdb
--
1.7.9.5
From 182ad76b890d3ccfaf81426cbc444818a6c36a53 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 6 Dec 2013 01:33:57 +0100
Subject: [PATCH 2/3] ctdb:packaging:RPM: package the new manpages
Signed-off-by: Michael Adam <obnox at samba.org>
---
ctdb/packaging/RPM/ctdb.spec.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index b7d1bef..7757070 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -202,9 +202,13 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/onnode
%{_mandir}/man1/ctdb.1.gz
%{_mandir}/man1/ctdbd.1.gz
+%{_mandir}/man1/ctdbd_wrapper.1.gz
%{_mandir}/man1/onnode.1.gz
%{_mandir}/man1/ltdbtool.1.gz
%{_mandir}/man1/ping_pong.1.gz
+%{_mandir}/man5/ctdbd.conf.5.gz
+%{_mandir}/man7/ctdb.7.gz
+%{_mandir}/man7/ctdb-tunables.7.gz
%{_libdir}/pkgconfig/ctdb.pc
--
1.7.9.5
From 6a3ea43564099b545a80391fc9846e412ff3639e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Fri, 6 Dec 2013 01:37:34 +0100
Subject: [PATCH 3/3] ctdb:packaging:RPM: don't run autogen.
autogen is already run in maketarball.sh which generates
the tarball for the RPM.
This way, we don't have a rpm build dependency on autoconf.
Recent changes introduced a dependency into autoconf
version >= 2.60, so this fix allows the generated
source RPM to be built also on older platforms.
Signed-off-by: Michael Adam <obnox at samba.org>
---
ctdb/packaging/RPM/ctdb.spec.in | 3 ---
1 file changed, 3 deletions(-)
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index 7757070..e3a3486 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -83,9 +83,6 @@ fi
export CC
-## always run autogen.sh
-./autogen.sh
-
CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
%if %with_included_talloc
--with-included-talloc \
--
1.7.9.5
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 215 bytes
Desc: Digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20131206/2007660b/attachment.pgp>
More information about the samba-technical
mailing list