fix pacemaker and pacemaker-mgmt build

3 files changed, 96 insertions, 0 deletions

diff --git a/package/pacemaker-mgmt/Makefile b/package/pacemaker-mgmt/Makefile
new file mode 100644
index 000000000..5a412863e
--- /dev/null
+++ b/package/pacemaker-mgmt/Makefile
@@ -0,0 +1,53 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		Pacemaker-Python-GUI
+PKG_VERSION:=		2.1.0
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		22379f78409cec9df10c25983783ef6c
+PKG_DESCR:=		Pacemaker GUI
+PKG_SECTION:=		ha
+PKG_BUILDDEP:=		pacemaker gnutls pam
+PKG_URL:=		http://hg.clusterlabs.org/pacemaker/pygui/
+PKG_SITES:=		http://openadk.org/distfiles/
+
+PKG_CFLINE_PACEMAKER_PYTHON_GUI:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+PKG_CFLINE_PACEMAKER_MGMTD:=	depends on ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC
+
+PKG_SUBPKGS:=		PACEMAKER_PYTHON_GUI PACEMAKER_MGMTD
+PKGSD_PACEMAKER_MGMTD:=	Management daemon for Pacemaker GUI
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,PACEMAKER_PYTHON_GUI,pacemaker-python-gui,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PACEMAKER_MGMTD,pacemaker-mgmtd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--with-initdir=/etc/init.d \
+			--with-ocf-root=/usr/lib/ocf \
+			--disable-fatal-warnings
+TARGET_CFLAGS+=		-I$(STAGING_DIR)/usr/include/python2.7 \
+			-I$(STAGING_DIR)/usr/include/pacemaker \
+			-I$(STAGING_DIR)/usr/include/heartbeat
+
+pacemaker-python-gui-install:
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui
+	$(CP) $(WRKINST)/usr/lib/heartbeat-gui/* \
+		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/lib/heartbeat-gui
+	$(CP) $(WRKINST)/usr/share/heartbeat-gui/* \
+		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/share/heartbeat-gui
+	$(CP) $(WRKINST)/usr/bin/*_gui \
+		$(IDIR_PACEMAKER_PYTHON_GUI)/usr/bin
+
+pacemaker-mgmtd-install:
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libhbmgmt*so* \
+		$(IDIR_PACEMAKER_MGMTD)/usr/lib
+	$(INSTALL_DIR) $(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat
+	$(INSTALL_BIN) $(WRKINST)/usr/lib/heartbeat/mgmtd \
+		$(IDIR_PACEMAKER_MGMTD)/usr/lib/heartbeat
+	
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/pacemaker-mgmt/patches/patch-configure b/package/pacemaker-mgmt/patches/patch-configure
new file mode 100644
index 000000000..bfbf2ae69
--- /dev/null
+++ b/package/pacemaker-mgmt/patches/patch-configure
@@ -0,0 +1,11 @@
+--- Pacemaker-Python-GUI-2.1.0.orig/configure	2011-10-07 11:55:11.000000000 +0200
++++ Pacemaker-Python-GUI-2.1.0/configure	2011-10-12 18:13:25.563559000 +0200
+@@ -5555,7 +5555,7 @@ case $libdir in
+     prefix|NONE|*exec_prefix*)
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking which lib directory to use" >&5
+ $as_echo_n "checking which lib directory to use... " >&6; }
+-    for aDir in lib64 lib
++    for aDir in lib
+     do
+       trydir="${exec_prefix}/${aDir}"
+       if
diff --git a/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c b/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c
new file mode 100644
index 000000000..1882093d5
--- /dev/null
+++ b/package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c
@@ -0,0 +1,32 @@
+--- Pacemaker-Python-GUI-2.1.0.orig/mgmt/daemon/mgmt_crm.c	2011-08-03 13:54:23.000000000 +0200
++++ Pacemaker-Python-GUI-2.1.0/mgmt/daemon/mgmt_crm.c	2011-10-07 16:15:59.000000000 +0200
+@@ -1393,7 +1393,7 @@ on_cleanup_rsc(char* argv[], int argc)
+ 				argv[1], cib_error2string(rc));
+ 	} else {
+ 		buffer = crm_concat("fail-count", argv[2], '-');
+-		delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, NULL,
++		delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL,
+ 				NULL, buffer, NULL, FALSE);
+ 		crm_free(dest_node);
+ 		crm_free(buffer);
+@@ -1403,7 +1403,7 @@ on_cleanup_rsc(char* argv[], int argc)
+ 	sleep(2); /* wait for the refresh */
+ 	now_s = crm_itoa(now);
+ 	update_attr(cib_conn, cib_sync_call,
+-		    XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
++		    XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
+ 	crm_free(now_s);
+ 
+ 	crmd_channel->ops->destroy(crmd_channel);
+@@ -1509,9 +1509,11 @@ on_get_rsc_status(char* argv[], int argc
+ 				strncat(buf, " (orphaned)", sizeof(buf)-strlen(buf)-1);
+ 			}
+ 
++			/*
+ 			if(is_set(rsc->flags, pe_rsc_failure_ignored)) {
+ 				strncat(buf, " (failure ignored)", sizeof(buf)-strlen(buf)-1);
+ 			}
++			*/
+ 
+ 			ret = mgmt_msg_append(ret, buf);
+ 			break;