From b624557d5cc294d7d3d56a7749dced071893b7ba Mon Sep 17 00:00:00 2001
From: mellor <mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 31 Mar 2010 01:00:37 +0000
Subject: [PATCH] updates to pkglists to match new builds, script fixes

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5619 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../xcat/IBMhpc/compilers/compilers_license   |  4 ++--
 .../share/xcat/IBMhpc/essl/essl_install       | 20 ++++++++-----------
 .../loadl.sles11.ppc64.otherpkgs.pkglist      |  2 +-
 .../pe/pe.sles11.ppc64.otherpkgs.pkglist      | 10 +++-------
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
index 41381bc7c..94a262b8c 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compilers/compilers_license
@@ -23,8 +23,8 @@ if [ $OS != "AIX" ]; then
     if [ $NODESETSTATE == "genimage" ]; then
     # Being called from <image>.postinstall script
     # Assume we are on the same machine
-        chroot $installroot echo 1 | $vacpp_script
-        chroot $installroot echo 1 | $xlf_script
+        echo 1 | chroot $installroot $vacpp_script
+        echo 1 | chroot $installroot $xlf_script
     fi
 fi  
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
index 5ca2e81ef..540efba28 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install
@@ -40,18 +40,14 @@ if [ $OS != "AIX" ]; then
     if [ $NODESETSTATE == "genimage" ]; then
     # Being called from <image>.postinstall script
     # Assume we are on the same machine
-        # IP of MN (this host)
-        MN=`hostname`
-        MNIP=`host -t A $MN | cut -d' ' -f4`
-        xcatmount=/xcatmount
-        chroot $installroot mkdir $xcatmount
-        chroot $installroot mount $MNIP:$ESSL_DIR $xcatmount
-        chroot $installroot rpm -Uvh $xcatmount/essl.license*.rpm
-        chroot $installroot $essl_bin/install_essl -y -d $xcatmount -nodocs
-        chroot $installroot rpm -Uvh $xcatmount/pessl.license*.rpm
-        chroot $installroot $pessl_bin/install_pessl -y -d $xcatmount -nodocs
-        chroot $installroot umount $xcatmount
-        chroot $installroot rmdir $xcatmount
+        tmpdir=tmpessl
+        mkdir $installroot/$tmpdir
+        cp -p $ESSL_DIR/* $installroot/$tmpdir
+        rpm --root $installroot -Uvh $installroot/$tmpdir/essl.license*.rpm
+        chroot $installroot $essl_bin/install_essl -y -nodocs -d /$tmpdir
+        rpm --root  $installroot -Uvh $installroot/$tmpdir/pessl.license*.rpm
+        chroot $installroot $pessl_bin/install_pessl -y -nodocs -d /$tmpdir
+        rm -rf $installroot/$tmpdir
     fi
 fi  
 
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.sles11.ppc64.otherpkgs.pkglist
index 844cae545..454e7e3bf 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.sles11.ppc64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/loadl/loadl.sles11.ppc64.otherpkgs.pkglist
@@ -1 +1 @@
-loadl/LoadL-resmgr-full-SLES11-PPC64
+loadl/LoadL-full-license-SLES11-PPC64
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.sles11.ppc64.otherpkgs.pkglist
index 5c5de3758..65dcd2a43 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.sles11.ppc64.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/pe/pe.sles11.ppc64.otherpkgs.pkglist
@@ -1,12 +1,8 @@
-lapi_ppc_32bit_base 
-lapi_ppc_64bit_IP_sles1100 
-lapi_ppc_32bit 
-lapi_ppc_64bit_US_sles1100 
 IBM_pe_license 
 #NEW_INSTALL_LIST#
+ibm_lapi_ip_sles11
+ibm_lapi_us_sles11
 ibm_pe_sles11 
-ppe_ppc_base_32bit_sles1100 
-ppe_ppc_64bit_sles1100 
 ppe_pdb_ppc_sles1100 
 sci_ppc_32bit_sles1100 
-sci_ppc_64bit_sles110
+sci_ppc_64bit_sles1100