Hi, all.

I am trying to build current dev tree for Heartbeat and Pacemaker and
found some problem.

1. mgmt and snmp_subagent are not supported by Heartbeat?
Probably mgmt is replaced to pygui provided by Pacemaker, Andrew. Is
it correct? And both Heartbeat and Pacemaker provide snmb_subagent,
but in Heartbeat is is not buildable. So, do you have a plan to
provide it on Pacemaker? If from now Heartbeat does not support them,
it is better to remove their source code from Heartbeat tar ball.

2. haresource2cib is provided by both Heartbeat and Pacemaker
Currently the one included in Heartbeat may be latest. And if
Pacemaker does not have plan to include latest version, should remove
it.

3. snmp_subagent is not built
I added some fix to Makefile.am and snmp_subaget
sources(Pacemaker_snmp_subagent_build.patch).

4. pacemaker.spec.in file does not manage snmp_subagent
I added some fix to it(pacemaker.spec.patch).

Regards
MATSUDA, Daiki
diff -uNrp Pacemaker-Devel-10e7d626f05c/snmp_subagent.orig/hbagentv2.c Pacemaker-Devel-10e7d626f05c/snmp_subagent/hbagentv2.c
--- Pacemaker-Devel-10e7d626f05c/snmp_subagent.orig/hbagentv2.c	2008-02-04 20:08:05.000000000 +0900
+++ Pacemaker-Devel-10e7d626f05c/snmp_subagent/hbagentv2.c	2008-02-14 09:25:27.000000000 +0900
@@ -1,4 +1,4 @@
-#include <lha_internal.h>
+#include <crm_internal.h>
 
 #include "hbagent.h"
 #include "hbagentv2.h"
diff -uNrp Pacemaker-Devel-10e7d626f05c/snmp_subagent.orig/LHAResourceStatusUpdate.c Pacemaker-Devel-10e7d626f05c/snmp_subagent/LHAResourceStatusUpdate.c
--- Pacemaker-Devel-10e7d626f05c/snmp_subagent.orig/LHAResourceStatusUpdate.c	2008-02-04 20:08:05.000000000 +0900
+++ Pacemaker-Devel-10e7d626f05c/snmp_subagent/LHAResourceStatusUpdate.c	2008-02-14 09:25:27.000000000 +0900
@@ -2,7 +2,7 @@
  * Note: this file originally auto-generated by mib2c using
  *        : mib2c.notify.conf,v 5.2.2.1 2004/04/15 12:29:06 dts12 Exp $
  */
-#include <lha_internal.h>
+#include <crm_internal.h>
 
 #include "hbagent.h"
 #include "hbagentv2.h"
diff -uNrp Pacemaker-Devel-10e7d626f05c/snmp_subagent.orig/LHAResourceTable.c Pacemaker-Devel-10e7d626f05c/snmp_subagent/LHAResourceTable.c
--- Pacemaker-Devel-10e7d626f05c/snmp_subagent.orig/LHAResourceTable.c	2008-02-04 20:08:05.000000000 +0900
+++ Pacemaker-Devel-10e7d626f05c/snmp_subagent/LHAResourceTable.c	2008-02-14 09:25:27.000000000 +0900
@@ -3,7 +3,7 @@
  *        : mib2c.iterate.conf,v 5.9 2003/06/04 00:14:41 hardaker Exp $
  */
 
-#include <lha_internal.h>
+#include <crm_internal.h>
 
 
 #include <net-snmp/net-snmp-config.h>
--- Pacemaker-Devel-10e7d626f05c/Makefile.am.orig	2008-02-14 09:40:29.000000000 +0900
+++ Pacemaker-Devel-10e7d626f05c/Makefile.am	2008-02-14 09:41:53.000000000 +0900
@@ -34,9 +34,9 @@
 
 if SNMP_SUBAGENT_BUILD
 SNMP_SUBAGENT_DIR = snmp_subagent
 endif
 
-SUBDIRS	= debian build replace include lib cib crmd pengine transitioner crm tools doc cts
+SUBDIRS	= debian build replace include lib cib crmd pengine transitioner crm tools doc cts $(SNMP_SUBAGENT_DIR)
 
 tgz:
 	rm -f $(TARFILE)
--- Pacemaker-0-6-e7152d1be933/pacemaker.spec.orig	2008-02-14 12:54:32.000000000 +0900
+++ Pacemaker-0-6-e7152d1be933/pacemaker.spec	2008-02-14 12:56:25.000000000 +0900
@@ -15,6 +15,7 @@
 %define without_fatal_warnings 	1
 %define with_ais_support        1
 %define with_heartbeat_support  1
+%define with_snmp_support	1
 
 %define pkg_group Productivity/Clustering/HA
 
@@ -148,6 +149,11 @@
 	--with-group-name=%{gname} --with-ccmuser-name=%{uname} \
 	--with-hapkgversion=%{version} 				\
 	--enable-glib-malloc 					\
+%if %with_snmp_support == 1
+	--enable-snmp-subagent					\
+%else
+	--disable-snmp-subagent					\
+%endif
 	--with-ais-prefix=%{_prefix}      			\
 %if %with_ais_support == 0
 	--without-ais-support 					\
@@ -213,7 +219,7 @@
 
 %{_prefix}/share/pacemaker
 %{_prefix}/share/heartbeat
-%{_libdir}/heartbeat
+%{_libdir}/heartbeat/*
 
 %dir %{_var}/lib/heartbeat
 
@@ -249,6 +255,9 @@
 %if %with_ais_support
 %{_libexecdir}/lcrso/pacemaker.lcrso
 %endif
+%if %with_snmp_support == 1
+/usr/share/snmp/mibs/LINUX-HA-MIB.mib
+%endif
 
 %files devel
 %defattr(-,root,root)
_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/

Reply via email to