From 5c166e6ea0ac444409c065716ad8465c34744672 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Wed, 1 Dec 2010 04:23:40 +0000 Subject: [PATCH] Update platform files This commit was SVN r24119. --- contrib/platform/cisco/ebuild/hlfr | 1 - contrib/platform/cisco/ebuild/hlfr.conf | 1 + contrib/platform/cisco/ebuild/ludd | 1 - contrib/platform/cisco/ebuild/ludd.conf | 1 + contrib/platform/cisco/ebuild/native | 1 - contrib/platform/cisco/ebuild/native.conf | 1 + contrib/platform/cisco/linux | 2 -- contrib/platform/cisco/linux-static.conf | 2 +- contrib/platform/cisco/macosx-dynamic | 1 - contrib/platform/cisco/macosx-dynamic.conf | 1 + contrib/platform/openrcm/debug | 2 -- contrib/platform/openrcm/debug.conf | 1 + 12 files changed, 6 insertions(+), 9 deletions(-) diff --git a/contrib/platform/cisco/ebuild/hlfr b/contrib/platform/cisco/ebuild/hlfr index 47d2434c4b..cef9a147ea 100644 --- a/contrib/platform/cisco/ebuild/hlfr +++ b/contrib/platform/cisco/ebuild/hlfr @@ -1,4 +1,3 @@ -enable_event_thread_support=yes enable_dlopen=yes enable_multicast=yes enable_sensors=yes diff --git a/contrib/platform/cisco/ebuild/hlfr.conf b/contrib/platform/cisco/ebuild/hlfr.conf index 86faedc8b3..a1866f99dc 100644 --- a/contrib/platform/cisco/ebuild/hlfr.conf +++ b/contrib/platform/cisco/ebuild/hlfr.conf @@ -58,6 +58,7 @@ orte_max_local_restarts = 1 orte_max_global_restarts = 1 rmaps = resilient orte_create_session_dirs = 0 +orte_enable_progress_threads = 1 ## Add the interface for out-of-band communication ## and set it up diff --git a/contrib/platform/cisco/ebuild/ludd b/contrib/platform/cisco/ebuild/ludd index 1572b462be..ab5541ba05 100644 --- a/contrib/platform/cisco/ebuild/ludd +++ b/contrib/platform/cisco/ebuild/ludd @@ -1,4 +1,3 @@ -enable_event_thread_support=yes enable_dlopen=yes enable_multicast=yes enable_sensors=yes diff --git a/contrib/platform/cisco/ebuild/ludd.conf b/contrib/platform/cisco/ebuild/ludd.conf index a52c9c475d..b57b07777a 100644 --- a/contrib/platform/cisco/ebuild/ludd.conf +++ b/contrib/platform/cisco/ebuild/ludd.conf @@ -58,6 +58,7 @@ orte_max_local_restarts = 1 orte_max_global_restarts = 1 rmaps = resilient orte_create_session_dirs = 0 +orte_enable_progress_threads = 1 ## Add the interface for out-of-band communication ## and set it up diff --git a/contrib/platform/cisco/ebuild/native b/contrib/platform/cisco/ebuild/native index ce4b0d9e73..60c155c72e 100644 --- a/contrib/platform/cisco/ebuild/native +++ b/contrib/platform/cisco/ebuild/native @@ -1,4 +1,3 @@ -enable_event_thread_support=yes enable_dlopen=yes enable_multicast=yes enable_sensors=yes diff --git a/contrib/platform/cisco/ebuild/native.conf b/contrib/platform/cisco/ebuild/native.conf index a52c9c475d..b57b07777a 100644 --- a/contrib/platform/cisco/ebuild/native.conf +++ b/contrib/platform/cisco/ebuild/native.conf @@ -58,6 +58,7 @@ orte_max_local_restarts = 1 orte_max_global_restarts = 1 rmaps = resilient orte_create_session_dirs = 0 +orte_enable_progress_threads = 1 ## Add the interface for out-of-band communication ## and set it up diff --git a/contrib/platform/cisco/linux b/contrib/platform/cisco/linux index a7618aff1e..c917a73a3d 100644 --- a/contrib/platform/cisco/linux +++ b/contrib/platform/cisco/linux @@ -1,5 +1,3 @@ -enable_event_thread_support=yes -enable_event_debug=yes enable_multicast=yes enable_sensors=yes enable_heartbeat=yes diff --git a/contrib/platform/cisco/linux-static.conf b/contrib/platform/cisco/linux-static.conf index 2293317472..b57b07777a 100644 --- a/contrib/platform/cisco/linux-static.conf +++ b/contrib/platform/cisco/linux-static.conf @@ -56,9 +56,9 @@ opal_set_max_sys_limits = 1 orte_enable_recovery = 1 orte_max_local_restarts = 1 orte_max_global_restarts = 1 -routed = cm rmaps = resilient orte_create_session_dirs = 0 +orte_enable_progress_threads = 1 ## Add the interface for out-of-band communication ## and set it up diff --git a/contrib/platform/cisco/macosx-dynamic b/contrib/platform/cisco/macosx-dynamic index 03c512fa06..a49cb40bce 100644 --- a/contrib/platform/cisco/macosx-dynamic +++ b/contrib/platform/cisco/macosx-dynamic @@ -1,4 +1,3 @@ -enable_event_thread_support=yes enable_event_debug=yes enable_heartbeat=yes enable_multicast=yes diff --git a/contrib/platform/cisco/macosx-dynamic.conf b/contrib/platform/cisco/macosx-dynamic.conf index 253924cee2..eea8ef3903 100644 --- a/contrib/platform/cisco/macosx-dynamic.conf +++ b/contrib/platform/cisco/macosx-dynamic.conf @@ -67,6 +67,7 @@ orte_create_session_dirs = 0 orte_enable_recovery = 1 orte_max_local_restarts = 1 orte_max_global_restarts = 1 +orte_enable_progress_threads = 1 ## Add the interface for out-of-band communication ## and set it up diff --git a/contrib/platform/openrcm/debug b/contrib/platform/openrcm/debug index bb1cb65220..35a4c69a09 100644 --- a/contrib/platform/openrcm/debug +++ b/contrib/platform/openrcm/debug @@ -1,5 +1,3 @@ -enable_event_thread_support=yes -enable_event_debug=yes enable_multicast=yes enable_sensors=yes enable_heartbeat=yes diff --git a/contrib/platform/openrcm/debug.conf b/contrib/platform/openrcm/debug.conf index a52c9c475d..b57b07777a 100644 --- a/contrib/platform/openrcm/debug.conf +++ b/contrib/platform/openrcm/debug.conf @@ -58,6 +58,7 @@ orte_max_local_restarts = 1 orte_max_global_restarts = 1 rmaps = resilient orte_create_session_dirs = 0 +orte_enable_progress_threads = 1 ## Add the interface for out-of-band communication ## and set it up