On Fri, Dec 23, 2005 at 06:17:27PM +0100, Filip Sneppe wrote:
> Hi,
>
> I am attempting to build a Debian package from current heartbeat CVS, before
> 2.0.3 is actually released.
Hi Filip,
thanks for proding me to look into this. There were a number
of minor changes needed to get the build working. Mainly
either build dependancies, or adding or removing files from
the packages. The patch below should make today's CVS tree
(clean checkout of course) work with today's Sid.
Alan,
I'd like to commit this to the tree if it doesn't break
your release cycle. Evyerhing is in debian/ so it shouldn't break
anything you have tested.
--
Horms
Patch to allow current CVS HEAD to compile cleanly on Debian Sid as of today
Note about Building:
Please observe the Build-Depends and Build-Conflicts lines
in debian/rules if you are having problems.
Note about building packages:
Please run "./debianr/rules apply" if you want to build
using fakeroot (which I recommend you do).
Note about applying to CVS:
Please remove patches/00-ssh_scp_path.patch and patches/series/2.0.0-1 from
CVS, this patch should remove them locally.
Horms 27th December 2005
Index: debian/Makefile.am
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- debian/Makefile.am 27 Sep 2005 03:06:11 -0000 1.21
+++ debian/Makefile.am 27 Dec 2005 08:05:16 -0000
@@ -28,9 +28,7 @@
heartbeat-2-dev.dirs heartbeat-2-dev.files \
ldirectord-2.files ldirectord-2.postinst \
ldirectord-2.postrm \
- patches/00-ssh_scp_path.patch \
patches/02-chown-check.patch \
- patches/series/2.0.0-1 \
patches/series/2.0.3-1
Index: debian/changelog
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/changelog,v
retrieving revision 1.51
diff -u -r1.51 changelog
--- debian/changelog 7 Nov 2005 04:27:04 -0000 1.51
+++ debian/changelog 27 Dec 2005 08:05:17 -0000
@@ -5,6 +5,24 @@
(closes: #336580)
* Slightly Enhanced package descriptions
(closes: #337030)
+ * Add build dependancy on swig
+ * As PYTHON_PATH has been added to configure.in it seems that autoconf1.4
+ can no longer build this tree. Currently autoconf is provided by
+ autoconf1.4, and autoconfn is a virtual package provided by autoconf1.7,
+ 1.8 and 1.9. Accordingly, replace the autoconf build dependancy with
+ autoconf1.9 | autoconfn. And add a build conflict on autoconf1.4. This
+ way the autoconf command should be autoconf1.7, 1.8 or 1.9, but not 1.4
+ as was previously the case.
+ * Don't apply 00-ssh_scp_path.patch as it should no longer be needed,
+ instead add a build dependancy on openssh-client.
+ Also removed call to relevant configure options.
+ * Removed configure option that no longer exists
+ --enable-checkpointd
+ * Removed configure options that are now on by default
+ --enable-crm --enable-lrm
+ * Add build dependancy on libgnutls11-dev, as 1.0 probably doesn't
+ compile as _t types don't exist.
+ http://lists.gnu.org/archive/html/help-gnutls/2004-08/msg00001.html
-- Simon Horman <[EMAIL PROTECTED]> Mon, 7 Nov 2005 13:20:57 +0900
Index: debian/control
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.38
diff -u -r1.38 control
--- debian/control 7 Nov 2005 04:27:04 -0000 1.38
+++ debian/control 27 Dec 2005 08:05:17 -0000
@@ -2,7 +2,8 @@
Section: admin
Priority: optional
Maintainer: Simon Horman <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib2.0-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libtool, automake, libcurl3-openssl-dev, libxml2-dev, bison, flex,
uuid-dev, libopenipmi-dev (>= 2.0.1), lynx, libbz2-dev, zlib1g-dev, uuid-dev,
libsensors-dev, libltdl3-dev
+Build-Depends: debhelper (>= 4.0.0), libsnmp9-dev, libglib2.0-dev, perl,
net-tools, netkit-ping | iputils-ping, python, psmisc, modutils, libnet1-dev,
iproute, libtool, automake1.9 | automaken, libcurl3-openssl-dev, libxml2-dev,
bison, flex, uuid-dev, libopenipmi-dev (>= 2.0.1), lynx, libbz2-dev,
zlib1g-dev, uuid-dev, libsensors-dev, libltdl3-dev, swig, openssh-client,
libgnutls11-dev
+Build-Conflicts: automake1.4
Standards-Version: 3.6.2
Package: ldirectord-2
Index: debian/heartbeat-2-dev.files
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2-dev.files,v
retrieving revision 1.3
diff -u -r1.3 heartbeat-2-dev.files
--- debian/heartbeat-2-dev.files 24 Aug 2005 07:32:40 -0000 1.3
+++ debian/heartbeat-2-dev.files 27 Dec 2005 08:05:17 -0000
@@ -6,9 +6,12 @@
usr/include/clplumbing/cl_malloc.h
usr/include/clplumbing/cl_misc.h
usr/include/clplumbing/cl_pidfile.h
+usr/include/clplumbing/cl_plugin.h
usr/include/clplumbing/cl_poll.h
usr/include/clplumbing/cl_signal.h
usr/include/clplumbing/cl_syslog.h
+usr/include/clplumbing/cl_tiebreaker.h
+usr/include/clplumbing/cl_quorum.h
usr/include/clplumbing/cl_uuid.h
usr/include/clplumbing/coredumps.h
usr/include/clplumbing/coredumps.h
@@ -17,6 +20,7 @@
usr/include/clplumbing/loggingdaemon.h
usr/include/clplumbing/longclock.h
usr/include/clplumbing/lsb_exitcodes.h
+usr/include/clplumbing/md5.h
usr/include/clplumbing/mkstemp_mode.h
usr/include/clplumbing/netstring.h
usr/include/clplumbing/proctrack.h
@@ -41,6 +45,10 @@
usr/include/heartbeat/iso8601.h
usr/include/heartbeat/lrm_api.h
usr/include/heartbeat/lrm_msg.h
+usr/include/heartbeat/mgmt_client.h
+usr/include/heartbeat/mgmt_common.h
+usr/include/heartbeat/mgmt.h
+usr/include/heartbeat/mgmt_tls.h
usr/include/heartbeat/msg.h
usr/include/heartbeat/msg_xml.h
usr/include/heartbeat/racommon.h
Index: debian/heartbeat-2.files
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/heartbeat-2.files,v
retrieving revision 1.8
diff -u -r1.8 heartbeat-2.files
--- debian/heartbeat-2.files 3 Oct 2005 05:56:16 -0000 1.8
+++ debian/heartbeat-2.files 27 Dec 2005 08:05:17 -0000
@@ -1,3 +1,4 @@
+
/etc/ha.d/README.config
/etc/ha.d/harc
/etc/ha.d/rc.d/ask_resources
@@ -40,19 +41,12 @@
usr/lib/heartbeat/apphbd
usr/lib/heartbeat/apphbtest
usr/lib/heartbeat/atest
+usr/lib/heartbeat/base64_md5_test
usr/lib/heartbeat/ccm
usr/lib/heartbeat/ccm_testclient
-usr/lib/heartbeat/ccm_tool
usr/lib/heartbeat/cib
-usr/lib/heartbeat/cibadmin
usr/lib/heartbeat/cibmon
usr/lib/heartbeat/clmtest
-usr/lib/heartbeat/crm_attribute
-usr/lib/heartbeat/crm_diff
-usr/lib/heartbeat/crm_master
-usr/lib/heartbeat/crm_mon
-usr/lib/heartbeat/crm_standby
-usr/lib/heartbeat/crmadmin
usr/lib/heartbeat/crmd
usr/lib/heartbeat/crmtest/1node.sh
usr/lib/heartbeat/crmtest/2node-empty.sh
@@ -77,11 +71,13 @@
usr/lib/heartbeat/cts/CTStests.py
usr/lib/heartbeat/cts/OCFIPraTest.py
usr/lib/heartbeat/cts/extracttests.py
-usr/lib/heartbeat/cts/haresources2cib.py
usr/lib/heartbeat/findif
usr/lib/heartbeat/ha_config
usr/lib/heartbeat/ha_logd
usr/lib/heartbeat/ha_logger
+usr/lib/heartbeat/haresources2cib.py
+usr/lib/heartbeat/hb_addnode
+usr/lib/heartbeat/hb_delnode
usr/lib/heartbeat/hb_standby
usr/lib/heartbeat/hb_takeover
usr/lib/heartbeat/hbagent
@@ -90,7 +86,6 @@
usr/lib/heartbeat/ipctransientclient
usr/lib/heartbeat/ipctransientserver
usr/lib/heartbeat/ipfail
-usr/lib/heartbeat/iso8601
usr/lib/heartbeat/logtest
usr/lib/heartbeat/lrmadmin
usr/lib/heartbeat/lrmd
@@ -115,7 +110,9 @@
usr/lib/heartbeat/plugins/RAExec/lsb.so
usr/lib/heartbeat/plugins/RAExec/ocf.so
usr/lib/heartbeat/plugins/RAExec/stonith.so
+usr/lib/heartbeat/plugins/quorum/majority.so
usr/lib/heartbeat/plugins/test/test.so
+usr/lib/heartbeat/plugins/tiebreaker/twonodes.so
usr/lib/heartbeat/ptest
usr/lib/heartbeat/recoverymgrd
usr/lib/heartbeat/req_resource
@@ -129,18 +126,18 @@
usr/lib/libapphb.so.0.0.0
usr/lib/libccmclient.so.1
usr/lib/libccmclient.so.1.0.0
-usr/lib/libcib.so.0
-usr/lib/libcib.so.0.0.0
+usr/lib/libcib.so.1
+usr/lib/libcib.so.1.0.0
usr/lib/libclm.so.1
usr/lib/libclm.so.1.0.0
-usr/lib/libcrmcommon.so.0
-usr/lib/libcrmcommon.so.0.0.0
+usr/lib/libcrmcommon.so.1
+usr/lib/libcrmcommon.so.1.0.0
usr/lib/libhbclient.so.1
usr/lib/libhbclient.so.1.0.0
usr/lib/liblrm.so.0
usr/lib/liblrm.so.0.0.0
-usr/lib/libpengine.so.0
-usr/lib/libpengine.so.0.0.0
+usr/lib/libpengine.so.1
+usr/lib/libpengine.so.1.0.0
usr/lib/libpils.so.1
usr/lib/libpils.so.1.0.0
usr/lib/libplumb.so.1
@@ -174,7 +171,6 @@
usr/lib/ocf/resource.d/heartbeat/apache
usr/lib/ocf/resource.d/heartbeat/db2
usr/lib/ocf/resource.d/heartbeat/drbd
-usr/lib/ocf/resource.d/heartbeat/ocf-shellfuncs
usr/lib/ocf/resource.d/heartbeat/portblock
usr/lib/pils/plugins/InterfaceMgr/generic.so
usr/lib/stonith/plugins/external/riloe
@@ -197,6 +193,18 @@
usr/lib/stonith/plugins/stonith2/ssh.so
usr/lib/stonith/plugins/stonith2/suicide.so
usr/lib/stonith/plugins/stonith2/wti_nps.so
+usr/sbin/ccm_tool
+usr/sbin/cibadmin
+usr/sbin/crm_attribute
+usr/sbin/crm_diff
+usr/sbin/crm_master
+usr/sbin/crm_mon
+usr/sbin/crm_resource
+usr/sbin/crm_standby
+usr/sbin/crm_uuid
+usr/sbin/crm_verify
+usr/sbin/crmadmin
+usr/sbin/iso8601
usr/sbin/meatclient
usr/sbin/stonith
usr/share/doc/heartbeat-2/AUTHORS
@@ -224,6 +232,8 @@
usr/share/doc/heartbeat-2/startstop
usr/share/man/man1/cl_status.1.gz
usr/share/man/man1/ha_logger.1.gz
+usr/share/man/man1/hb_addnode.1.gz
+usr/share/man/man1/hb_delnode.1.gz
usr/share/man/man1/hb_standby.1.gz
usr/share/man/man1/hb_takeover.1.gz
usr/share/man/man8/apphbd.8.gz
Index: debian/rules
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/rules,v
retrieving revision 1.35
diff -u -r1.35 rules
--- debian/rules 3 Oct 2005 05:56:16 -0000 1.35
+++ debian/rules 27 Dec 2005 08:05:17 -0000
@@ -23,9 +23,7 @@
cfg:=--prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--mandir=/usr/share/man \
- --with-ssh-path=/usr/bin/ssh --with-scp-path=/usr/bin/ssh \
--with-group-name=haclient --with-ccmuser-name=hacluster \
- --enable-checkpointd --enable-crm --enable-lrm \
--enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs \
--disable-fatal-warnings
Index: debian/patches/00-ssh_scp_path.patch
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/patches/00-ssh_scp_path.patch,v
retrieving revision 1.1
diff -u -r1.1 00-ssh_scp_path.patch
--- debian/patches/00-ssh_scp_path.patch 24 Sep 2004 06:34:38 -0000
1.1
+++ debian/patches/00-ssh_scp_path.patch 27 Dec 2005 08:05:17 -0000
@@ -1,43 +0,0 @@
---- heartbeat-1.2.3.debian/configure.in 2004-09-18 15:24:22.000000000
+0900
-+++ heartbeat-1.2.2.debian/configure.in 2004-08-29 17:13:23.000000000
+0900
-@@ -1173,6 +1134,40 @@
- AC_DEFINE_UNQUOTED(UCDSNMPDEVEL, $UCDSNMPDEVEL,
- Name of UCD SNMP development package)
-
-+#
-+# Path to SSH
-+# This is guessed if ssh is installed.
-+# However, there is a long standing bug with installing ssh
-+# on arm in debian and this is preventing heartbeat from
-+# moving into sarge. By adding this we can remove the build
-+# dependancy on ssh and get an updated heartbeat into sarge...
-+# I hope. Horms 26th July 2004
-+#
-+AC_ARG_WITH(
-+ ssh-path,
-+ [ --with-ssh-path=path Path to SSH binary (e.g. /usr/bin/ssh)
-+ [default=autodetect] ],
-+ [ SSH=$withval ],
-+ )
-+AC_SUBST(SSH)
-+
-+#
-+# Path to SCP
-+# This is guessed if ssh is installed.
-+# However, there is a long standing bug with installing ssh
-+# on arm in debian and this is preventing heartbeat from
-+# moving into sarge. By adding this we can remove the build
-+# dependancy on ssh and get an updated heartbeat into sarge...
-+# I hope. Horms 26th July 2004
-+#
-+AC_ARG_WITH(
-+ scp-path,
-+ [ --with-scp-path=path Path to SCP binary (e.g. /usr/bin/scp)
-+ [default=autodetect] ],
-+ [ SCP=$withval ],
-+ )
-+AC_SUBST(SCP)
-+
- dnl ************************************************************************
- dnl checks for library functions to replace them
- dnl
Index: debian/patches/series/2.0.0-1
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/patches/series/2.0.0-1,v
retrieving revision 1.5
diff -u -r1.5 2.0.0-1
--- debian/patches/series/2.0.0-1 4 Aug 2005 08:51:31 -0000 1.5
+++ debian/patches/series/2.0.0-1 27 Dec 2005 08:05:17 -0000
@@ -1 +0,0 @@
-+ 00-ssh_scp_path.patch
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
