From a18f195f0db0ba0d15d8c3c245b85adcad234d3c Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 18 Sep 2012 06:52:34 +0000
Subject: [PATCH] Fixing bug 3567143 and 3568764, update PE/essl for hpc
 integration

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13830 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc_all.bnd | 15 ++-------------
 xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.bnd  | 14 +++++++++-----
 xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.bnd      | 11 ++---------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc_all.bnd b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc_all.bnd
index bfa1c9fcc..54ab05cd0 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc_all.bnd
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/IBMhpc_all.bnd
@@ -22,24 +22,17 @@ I:xlsmp.rte
 # AIX bundle package list for PE
 
 # POE
-I:ppe.poe
-I:ppe.pdb
+I:ppe.rte
 #I:ppe.man
 I:ppe.loc.license
 
 # needed on login node
-#I:ppe.hpct
+#I:ppedev.hpct
 
 # LAPI
 I:rsct.lapi
 #I:rsct.sci
 
-# MetaCluster (checkpoint/restore)
-I:mcr.rte
-I:mdcr
-
-
-
 # AIX bundle file for ESSL and PESSL packages
 
 # ESSL
@@ -53,11 +46,7 @@ I:essl.loc.license
 
 # PESSL
 I:pessl.rte.up
-I:pessl.rte.smp
-I:pessl.rte.rs1
 I:pessl.rte.mp
-I:pessl.rte.hv
-I:pessl.rte.common
 I:pessl.rte
 I:pessl.msg.en_US
 #I:pessl.msg.En_US
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.bnd b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.bnd
index 248cd4c9a..c04febbdc 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.bnd
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.bnd
@@ -11,14 +11,18 @@ I:essl.loc.license
 
 # PESSL
 I:pessl.rte.up
-I:pessl.rte.smp
-I:pessl.rte.rs1
 I:pessl.rte.mp
-# If you are using PESSL 4.1.0 or beyond, comment pessl.rte.hv out, it's not needed.
-I:pessl.rte.hv
-I:pessl.rte.common
 I:pessl.rte
 I:pessl.msg.en_US
+
+# If you are using PESSL 4.1.0 or beyond, comment pessl.rte.hv out, it's not needed.
+#I:pessl.rte.hv
+
+# If you are using PESSL 4.2.0 or beyond, comment pessl.rte.smp,pessl.rte.rs1,and pessl.rte.common, they have been built into pessl.rte.up and pessl.rte.mp
+#I:pessl.rte.common
+#I:pessl.rte.smp
+#I:pessl.rte.rs1
+
 #I:pessl.msg.En_US
 #I:pessl.man.en_US
 I:pessl.loc.license
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.bnd b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.bnd
index e7529950a..4858d55e3 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.bnd
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.bnd
@@ -1,20 +1,13 @@
 # AIX bundle package list for PE
 
 # POE
-I:ppe.poe
-I:ppe.pdb
+I:ppe.rte
 #I:ppe.man
 I:ppe.loc.license
 
 # needed on login node
-#I:ppe.hpct
+#I:ppedev.hpct
 
 # LAPI
 I:rsct.lapi
 #I:rsct.sci
-
-# MetaCluster (checkpoint/restore)
-I:mcr.rte
-I:mdcr
-
-