diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-03-04 17:52:39 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-03-04 17:52:39 +0100 |
| commit | 7e2ccca948a513f888bdaad33c0f9aec571972f7 (patch) | |
| tree | 2c9ac35b2e8c540797a66a36dfe40b864abf061c /package/pacemaker-mgmt/patches | |
| parent | ddb8c72a40d69c786062e3f92c9a2155726a6ea4 (diff) | |
fix pacemaker and pacemaker-mgmt build
Diffstat (limited to 'package/pacemaker-mgmt/patches')
| -rw-r--r-- | package/pacemaker-mgmt/patches/patch-configure | 11 | ||||
| -rw-r--r-- | package/pacemaker-mgmt/patches/patch-mgmt_daemon_mgmt_crm_c | 32 |
2 files changed, 43 insertions, 0 deletions
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; |