tags 640581 + patch thanks Attached is a patch that fixes the FTBFS bug. First of all the libopenais-dev Build-Dep needs to be changed to openais-dev. Then ocfs2_controld gets built again. But it then fails because PCKM_SERVICE_ID is not defined (in ocfs2_controld.c:155). Since neither CRM_SERVICE nor PCKM_SERVICE_ID are used anywhere, I've changed the error message as I don't know what PCKM_SERVICE_ID was before and couldn't find anything on it. In Ubuntu PCKM_SERVICE_ID is defined to be 9 [1]. But maybe someone else more familiar with ocfs2-tools knows what's the best way to fix this issue.
Regards, [1] http://patches.ubuntu.com/o/ocfs2-tools/ocfs2-tools_1.6.3-2ubuntu2.patch -- Sebastian Ramacher
diff -Nru ocfs2-tools-1.6.3/debian/control ocfs2-tools-1.6.3/debian/control --- ocfs2-tools-1.6.3/debian/control 2011-03-25 16:24:41.000000000 +0100 +++ ocfs2-tools-1.6.3/debian/control 2011-09-20 00:34:01.000000000 +0200 @@ -4,7 +4,7 @@ Maintainer: Jeremy Lainé <[email protected]> Uploaders: Frederik Schüler <[email protected]> Standards-Version: 3.9.1 -Build-Depends: cdbs, debhelper (>= 7), po-debconf, autotools-dev, python-support (>= 0.4), comerr-dev, uuid-dev, libncurses5-dev, libreadline-dev, libglib2.0-dev (>= 2.2.3), libblkid-dev (>= 1.36), libbz2-dev, libcman-dev, libdevmapper-dev, libdlm-dev, libdlmcontrol-dev, libopenais-dev, libxml2-dev, pacemaker-dev, python-dev, python-gtk2 +Build-Depends: cdbs, debhelper (>= 7), po-debconf, autotools-dev, python-support (>= 0.4), comerr-dev, uuid-dev, libncurses5-dev, libreadline-dev, libglib2.0-dev (>= 2.2.3), libblkid-dev (>= 1.36), libbz2-dev, libcman-dev, libdevmapper-dev, libdlm-dev, libdlmcontrol-dev, openais-dev, libxml2-dev, pacemaker-dev, python-dev, python-gtk2 Homepage: http://oss.oracle.com/projects/ocfs2-tools/ Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/ocfs2-tools/trunk/ Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/ocfs2-tools/trunk/ --- ocfs2-tools-1.6.3.orig/ocfs2_controld/pacemaker.c +++ ocfs2-tools-1.6.3/ocfs2_controld/pacemaker.c @@ -155,7 +155,7 @@ int setup_stack(void) + crm_log_init("ocfs2_controld", LOG_INFO, FALSE, TRUE, 0, NULL); + + if(init_ais_connection(NULL, NULL, NULL, &local_node_uname, &our_nodeid) == FALSE) { +- log_error("Connection to our AIS plugin (%d) failed", CRM_SERVICE); ++ log_error("Connection to our AIS plugin (CRM) failed"); + return -1; + } +
signature.asc
Description: OpenPGP digital signature
