[Debian-ha-maintainers] Pacemaker build based on the git repo

Pallai Roland dap at magex.hu
Fri Apr 24 16:25:48 UTC 2015 

Hi,

I'm not participating in the Debian project (except some bug reports) but I
need a Jessie with Pacemaker now so I cloned the new git repo, made some
changes, and successfully built Pacemaker on testing that works well in
test environments. I've used libqb backported from unstable (ya, that's
messy).
The patch attached, hope that helps a bit to someone to move forward.

I've seen that Feri and Stefan made some results but unfortunately I did
not have access to their work and had no time to discuss.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-ha-maintainers/attachments/20150424/cc418f07/attachment.html>
-------------- next part --------------
diff --git a/debian/control b/debian/control
index f9afff5..c5c54c7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: admin
 Priority: optional
 Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
 Uploaders: Martin Loschwitz <madkiss at debian.org>, Anibal Monsalve Salazar <anibal at debian.org>, Simon Horman <horms at debian.org>, Frederik Schüler <fs at debian.org>
-Build-Depends: debhelper (>= 7.0.50), automake, autoconf, chrpath, libsnmp-dev, libglib2.0-dev, perl, net-tools, python (>= 2.6.6-3~), libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, libbz2-dev, zlib1g-dev, libltdl3-dev, openssh-client, libgnutls-dev, libpam0g-dev, libncurses5-dev, libcorosync-dev (>= 1.4.4), libheartbeat2-dev (>= 3.0), libxslt1-dev, libesmtp-dev, cluster-glue-dev (>= 1.0.11+hg2754), liblrm2-dev, libpils2-dev, libplumb2-dev, libplumbgpl2-dev, libstonith1-dev, help2man, libxml2-utils, xsltproc, docbook-xsl, resource-agents-dev, libqb-dev (>= 0.16.0.real), hardening-wrapper
-Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 7.0.50), automake, autoconf, chrpath, libsnmp-dev, libglib2.0-dev, perl, net-tools, python (>= 2.6.6-3~), libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, libbz2-dev, zlib1g-dev, libltdl3-dev, openssh-client, libgnutls28-dev, libpam0g-dev, libncurses5-dev, libcorosync-dev (>= 1.4.4), libheartbeat2-dev (>= 3.0), libxslt1-dev, libesmtp-dev, cluster-glue-dev (>= 1.0.11+hg2754), liblrm2-dev, libpils2-dev, libplumb2-dev, libplumbgpl2-dev, libstonith1-dev, help2man, libxml2-utils, xsltproc, docbook-xsl, resource-agents-dev, libqb-dev (>= 0.16.0.real), hardening-wrapper
+Standards-Version: 3.9.3
 Homepage: http://clusterlabs.org/
 Vcs-Hg: http://hg.debian.org/hg/debian-ha/pacemaker
 Vcs-Browser: http://hg.debian.org/hg/debian-ha/pacemaker
@@ -12,7 +12,7 @@ X-Python-Version: >= 2.5
 
 Package: pacemaker
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libheartbeat2, resource-agents, python, adduser, corosync (>= 1.4.4) | heartbeat (>= 3.0), crmsh, pacemaker-cli-utils
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, resource-agents, python, adduser, corosync (>= 1.4.4-1) | heartbeat (>= 3.0), crmsh, pacemaker-cli-utils, iputils-ping
 Conflicts: pacemaker-heartbeat, pacemaker-openais
 Replaces: pacemaker-heartbeat, pacemaker-openais
 Description: HA cluster resource manager
@@ -56,7 +56,7 @@ Section: devel
 Architecture: any
 Replaces: pacemaker-heartbeat-dev, pacemaker-openais-dev
 Conflicts: pacemaker-heartbeat-dev, pacemaker-openais-dev
-Depends: ${shlibs:Depends}, ${misc:Depends}, pacemaker (>= ${binary:Version}), python, libcorosync-dev (>= 1.4.4), libheartbeat2-dev (>= 3.0) , libglib2.0-dev, libxml2-dev, libcluster-glue-dev (>= 1.0.11+hg2754), libcib3-dev (>= ${binary:Version}), libcrmcluster4-dev (>= ${binary:Version}), libcrmcommon3-dev (>= ${binary:Version}), libpe-rules2-dev (>= ${binary:Version}), libpe-status4-dev (>= ${binary:Version}), libpengine4-dev (>= ${binary:Version}), libstonithd2-dev (>= ${binary:Version}), libtransitioner2-dev (>= ${binary:Version}), liblrmd1-dev (>= ${binary:Version}), libcrmservice1-dev (>= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, pacemaker (>= ${binary:Version}), python, libcorosync-dev (>= 1.4.4-1), libheartbeat2-dev (>= 3.0) , libglib2.0-dev, libxml2-dev, libcluster-glue-dev (>= 1.0.11+hg2754), libcib4-dev (>= ${binary:Version}), libcrmcluster4-dev (>= ${binary:Version}), libcrmcommon3-dev (>= ${binary:Version}), libpe-rules2-dev (>= ${binary:Version}), libpe-status4-dev (>= ${binary:Version}), libpengine4-dev (>= ${binary:Version}), libstonithd2-dev (>= ${binary:Version}), libtransitioner2-dev (>= ${binary:Version}), liblrmd1-dev (>= ${binary:Version}), libcrmservice1-dev (>= ${binary:Version})
 Description: HA cluster resource manager (development files)
  High-Availability cluster resource manager for Heartbeat.
  .
@@ -83,23 +83,23 @@ Description: Debugging symbols for Pacemaker
  .
  This package contains the debugging symbols for Pacemaker.
 
-Package: libcib3-dev
+Package: libcib4-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libcib3 (= ${binary:Version})
-Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2), libcib1-dev, libcib2-dev, pacemaker-dev (<< 1.1.8+git20121010-1)
-Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2), libcib1-dev, libcib2-dev, pacemaker-dev (<< 1.1.8+git20121010-1)
+Depends: ${misc:Depends}, libcib4 (= ${binary:Version})
+Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2), libcib1-dev, libcib2-dev, libcib3-dev, pacemaker-dev (<< 1.1.8+git20121010-1)
+Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2), libcib1-dev, libcib2-dev, libcib3-dev, pacemaker-dev (<< 1.1.8+git20121010-1)
 Description: Development file for pacemaker's cib library
  This package contains static libraries, symbol files as well as
  headers provided by the pacemaker cluster manager (CIB). Install 
  it if you want to do development based on pacemaker.
 
-Package: libcib3
+Package: libcib4
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: pacemaker (<= 1.0.9.1+hg15626-2), libcib1, libcib2
-Conflicts: pacemaker (<= 1.0.9.1+hg15626-2), libcib1, libcib2
+Replaces: pacemaker (<= 1.0.9.1+hg15626-2), libcib1, libcib2, libcib3
+Conflicts: pacemaker (<= 1.0.9.1+hg15626-2), libcib1, libcib2, libcib3
 Description: Pacemaker libraries - CIB 
  This package contains some of the libraries provided by and needed
  for the pacemaker cluster manager. You need to install them if you
@@ -227,8 +227,8 @@ Package: libstonithd2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}, libstonithd2 (= ${binary:Version})
-Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2), libstonithd0-dev
-Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2), libstonithd0-dev
+Replaces: pacemaker-dev (<= 1.0.9.1+hg15626-2), libstonithd0-dev, libstonithd1-dev
+Conflicts: pacemaker-dev (<= 1.0.9.1+hg15626-2), libstonithd0-dev, libstonithd1-dev
 Description: Development file for pacemaker's stonith library
  This package contains static libraries, symbol files as well as
  headers provided by the pacemaker cluster manager (stonith). 
diff --git a/debian/libcib3-dev.install b/debian/libcib3-dev.install
deleted file mode 100644
index 4bccdb2..0000000
--- a/debian/libcib3-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/libcib.so
-usr/lib/libcib.a
-usr/lib/libcib.la
-usr/include/pacemaker/crm/cib/util.h
-usr/lib/pkgconfig/pacemaker-cib.pc 
diff --git a/debian/libcib3.install b/debian/libcib3.install
deleted file mode 100644
index 85490fe..0000000
--- a/debian/libcib3.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libcib.so.3
-usr/lib/libcib.so.3.0.1
diff --git a/debian/libcib4-dev.install b/debian/libcib4-dev.install
new file mode 100644
index 0000000..4bccdb2
--- /dev/null
+++ b/debian/libcib4-dev.install
@@ -0,0 +1,5 @@
+usr/lib/libcib.so
+usr/lib/libcib.a
+usr/lib/libcib.la
+usr/include/pacemaker/crm/cib/util.h
+usr/lib/pkgconfig/pacemaker-cib.pc 
diff --git a/debian/libcib4.install b/debian/libcib4.install
new file mode 100644
index 0000000..5ffb9d4
--- /dev/null
+++ b/debian/libcib4.install
@@ -0,0 +1,2 @@
+usr/lib/libcib.so.4
+usr/lib/libcib.so.4.0.0
diff --git a/debian/libcrmcluster4.install b/debian/libcrmcluster4.install
index 8d89046..285a47d 100644
--- a/debian/libcrmcluster4.install
+++ b/debian/libcrmcluster4.install
@@ -1,2 +1,2 @@
 usr/lib/libcrmcluster.so.4
-usr/lib/libcrmcluster.so.4.0.0
+usr/lib/libcrmcluster.so.4.0.1
diff --git a/debian/libcrmcommon3.install b/debian/libcrmcommon3.install
index 61d63d1..e4e2fc1 100644
--- a/debian/libcrmcommon3.install
+++ b/debian/libcrmcommon3.install
@@ -1,2 +1,2 @@
 usr/lib/libcrmcommon.so.3
-usr/lib/libcrmcommon.so.3.2.0
+usr/lib/libcrmcommon.so.3.3.0
diff --git a/debian/liblrmd1.install b/debian/liblrmd1.install
index 5b4175d..1bf2589 100644
--- a/debian/liblrmd1.install
+++ b/debian/liblrmd1.install
@@ -1,2 +1,2 @@
 usr/lib/liblrmd.so.1
-usr/lib/liblrmd.so.1.1.1
+usr/lib/liblrmd.so.1.1.2
diff --git a/debian/libpe-rules2.install b/debian/libpe-rules2.install
index 65cf933..a76ad41 100644
--- a/debian/libpe-rules2.install
+++ b/debian/libpe-rules2.install
@@ -1,2 +1,2 @@
 usr/lib/libpe_rules.so.2
-usr/lib/libpe_rules.so.2.0.2
+usr/lib/libpe_rules.so.2.0.3
diff --git a/debian/libpe-status4.install b/debian/libpe-status4.install
index a1b8bb6..251551a 100644
--- a/debian/libpe-status4.install
+++ b/debian/libpe-status4.install
@@ -1,2 +1,2 @@
 usr/lib/libpe_status.so.4
-usr/lib/libpe_status.so.4.2.0
+usr/lib/libpe_status.so.4.3.0
diff --git a/debian/libpengine4.install b/debian/libpengine4.install
index 39b7528..e897ab0 100644
--- a/debian/libpengine4.install
+++ b/debian/libpengine4.install
@@ -1,2 +1,2 @@
 usr/lib/libpengine.so.4
-usr/lib/libpengine.so.4.2.0
+usr/lib/libpengine.so.4.3.0
diff --git a/debian/libstonithd2.install b/debian/libstonithd2.install
index 3ead69c..efdfa27 100644
--- a/debian/libstonithd2.install
+++ b/debian/libstonithd2.install
@@ -1,2 +1,2 @@
 usr/lib/libstonithd.so.2
-usr/lib/libstonithd.so.2.1.0
+usr/lib/libstonithd.so.2.1.1
diff --git a/debian/libtransitioner2.install b/debian/libtransitioner2.install
index 3410883..046e8ce 100644
--- a/debian/libtransitioner2.install
+++ b/debian/libtransitioner2.install
@@ -1,2 +1,2 @@
 usr/lib/libtransitioner.so.2
-usr/lib/libtransitioner.so.2.0.1
+usr/lib/libtransitioner.so.2.0.2
diff --git a/debian/pacemaker.install b/debian/pacemaker.install
index c8173ba..9bedb2c 100644
--- a/debian/pacemaker.install
+++ b/debian/pacemaker.install
@@ -24,7 +24,7 @@ usr/lib/pacemaker/lrmd_test
 usr/lib/pacemaker/pengine
 usr/lib/pacemaker/stonithd
 usr/lib/pacemaker/stonith-test
-usr/lib/python*/*-packages/*/*.py
+usr/lib/python*/*-packages/cts/*.py
 usr/sbin/attrd_updater
 usr/sbin/fence_legacy
 usr/sbin/fence_pcmk
@@ -50,27 +50,13 @@ usr/share/man/man8/fence_legacy.8
 usr/share/man/man8/fence_pcmk.8
 usr/share/man/man8/pacemakerd.8
 usr/share/man/man8/stonith_admin.8
-usr/share/pacemaker/acls-1.1.rng
-usr/share/pacemaker/acls-1.2.rng
-usr/share/pacemaker/constraints-1.0.rng
-usr/share/pacemaker/constraints-1.1.rng
-usr/share/pacemaker/constraints-1.2.rng
+usr/share/pacemaker/*.rng
 usr/share/pacemaker/crm.dtd
 usr/share/pacemaker/crm-transitional.dtd
-usr/share/pacemaker/fencing.rng
 usr/share/pacemaker/nvset.rng
-usr/share/pacemaker/pacemaker-1.0.rng
-usr/share/pacemaker/pacemaker-1.1.rng
-usr/share/pacemaker/pacemaker-1.2.rng
-usr/share/pacemaker/pacemaker.rng
 usr/share/pacemaker/report.collector
 usr/share/pacemaker/report.common
-usr/share/pacemaker/resources-1.0.rng
-usr/share/pacemaker/resources-1.1.rng
-usr/share/pacemaker/resources-1.2.rng
-usr/share/pacemaker/rule.rng
-usr/share/pacemaker/score.rng
 usr/share/pacemaker/upgrade06.xsl
-usr/share/pacemaker/versions.rng
+usr/share/pacemaker/upgrade-1.3.xsl
 usr/share/snmp/mibs/PCMK-MIB.txt
 usr/lib/lcrso/pacemaker.lcrso 
diff --git a/debian/patches/default_file_for_pacemaker.patch b/debian/patches/default_file_for_pacemaker.patch
index 81d6f56..30e4615 100644
--- a/debian/patches/default_file_for_pacemaker.patch
+++ b/debian/patches/default_file_for_pacemaker.patch
@@ -1,7 +1,5 @@
-Index: pacemaker-1.1.11/mcp/pacemaker.sysconfig
-===================================================================
---- pacemaker-1.1.11.orig/mcp/pacemaker.sysconfig	2014-02-13 17:06:19.000000000 +0000
-+++ pacemaker-1.1.11/mcp/pacemaker.sysconfig	2014-02-21 14:37:53.000000000 +0000
+--- pacemaker-1.1.12.orig/mcp/pacemaker.sysconfig.orig	2015-04-24 16:10:54.000000000 +0200
++++ pacemaker-1.1.12/mcp/pacemaker.sysconfig	2015-04-24 17:17:11.192465623 +0200
 @@ -2,46 +2,46 @@
  
  # Turn on special handling for CMAN clusters in the init script
@@ -13,16 +11,15 @@ Index: pacemaker-1.1.11/mcp/pacemaker.sysconfig
  
  # Enable debug logging globally or per-subsystem
  # Multiple subsystems may me listed separated by commas
--# eg. PCMK_debug=crmd,pengine
+ # eg. PCMK_debug=crmd,pengine
 -# PCMK_debug=yes|no|crmd|pengine|cib|stonith-ng|attrd|pacemakerd
-+# eg. export PCMK_debug=crmd,pengine
 +# export PCMK_debug=yes|no|crmd|pengine|cib|stonith-ng|attrd|pacemakerd
  
  # Send INFO (and higher) messages to the named log file
  # Additional messages may also appear here depending on any configured debug and trace settings
  # By default Pacemaker will inherit the logfile specified in corosync.conf
--# PCMK_debugfile=/var/log/pacemaker.log
-+# export PCMK_debugfile=/var/log/pacemaker.log
+-# PCMK_logfile=/var/log/pacemaker.log
++# export PCMK_logfile=/var/log/pacemaker.log
  
  # Specify an alternate syslog target for NOTICE (and higher) messages
  # Use 'none' to disable - not recommended
@@ -41,9 +38,8 @@ Index: pacemaker-1.1.11/mcp/pacemaker.sysconfig
 +# export PCMK_trace_functions=function1,function2,function3
  
  # Log all messages from a comma-separated list of files (no path)
--# Supports wildcards eg. PCMK_trace_files=prefix*.c
+ # Supports wildcards eg. PCMK_trace_files=prefix*.c
 -# PCMK_trace_files=file.c,other.h
-+# Supports wildcards eg. export PCMK_trace_files=prefix*.c
 +# export PCMK_trace_files=file.c,other.h
  
  # Log all messages matching comma-separated list of formats
@@ -55,20 +51,17 @@ Index: pacemaker-1.1.11/mcp/pacemaker.sysconfig
 +# export PCMK_trace_tags=tag1,tag2
  
  # Dump the blackbox whenever the message at function and line is printed
--# eg. PCMK_trace_blackbox=te_graph_trigger:223,unpack_clone:81
+ # eg. PCMK_trace_blackbox=te_graph_trigger:223,unpack_clone:81
 -# PCMK_trace_blackbox=fn:line,fn2:line2,...
-+# eg. export PCMK_trace_blackbox=te_graph_trigger:223,unpack_clone:81
 +# export PCMK_trace_blackbox=fn:line,fn2:line2,...
  
  # Enable blackbox logging globally or per-subsystem
  # The blackbox contains a rolling buffer of all logs (including info+debug+trace)
-@@ -51,37 +51,37 @@
- # sending SIGUSR1 (or SIGTRAP), and disabled by sending SIGUSR2
+@@ -52,36 +52,36 @@
  #
  # Multiple subsystems may me listed separated by commas
--# eg. PCMK_blackbox=crmd,pengine
+ # eg. PCMK_blackbox=crmd,pengine
 -# PCMK_blackbox=yes|no|crmd|pengine|cib|stonith-ng|attrd|pacemakerd
-+# eg. export PCMK_blackbox=crmd,pengine
 +# export PCMK_blackbox=yes|no|crmd|pengine|cib|stonith-ng|attrd|pacemakerd
  
  #==#==# Advanced use only
diff --git a/debian/patches/raexecupstart.patch b/debian/patches/raexecupstart.patch
index b22eb54..1e47b8d 100644
--- a/debian/patches/raexecupstart.patch
+++ b/debian/patches/raexecupstart.patch
@@ -1,7 +1,7 @@
 Index: pacemaker-1.1.5/xml/crm-1.0.dtd
 ===================================================================
---- pacemaker-1.1.5.orig/xml/crm-1.0.dtd	2011-02-23 11:37:45.054047000 -0500
-+++ pacemaker-1.1.5/xml/crm-1.0.dtd	2011-02-23 11:38:39.887424200 -0500
+--- pacemaker-1.1.12.orig/xml/crm.dtd	2015-04-24 17:21:11.450960763 +0200
++++ pacemaker-1.1.12/xml/crm.dtd	2015-04-24 17:21:37.030799555 +0200
 @@ -215,7 +215,7 @@
  <!ATTLIST primitive
            id                CDATA        #REQUIRED
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 3b40f01..4de3e2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pacemaker (1.1.12-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Roland Pallai <pallair at magex.hu>  Fri, 24 Apr 2015 13:55:23 +0200
+
 pacemaker (1.1.11-1) experimental; urgency=medium
 
   * New upstream release

More information about the Debian-ha-maintainers mailing list