From e0514266f55a44206480fe2fcd499c0fe9c2b6ad Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 22 May 2012 08:53:36 +0000
Subject: [PATCH] Merging essl/pessl updates from 2.7 to trunk

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12866 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../xcat/IBMhpc/essl/essl.otherpkgs.pkglist   |   6 +
 .../xcat/IBMhpc/essl/essl_install_pessl4100   | 118 +++++++++---------
 2 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist
index 73eebf516..d6d90ed53 100755
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist
@@ -1 +1,7 @@
 essl/ibm-java2-ppc64-jre
+
+#ENV:IBM_ESSL_LICENSE_ACCEPT=yes#
+essl/essl*
+
+#ENV:IBM_PESSL_LICENSE_ACCEPT=yes#
+essl/pessl*
diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100 b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100
index 84f3777cd..fd4ad6efd 100644
--- a/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100
+++ b/xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100
@@ -8,62 +8,62 @@
 #    Assumes all prerequisite software has been installed (e.g. compilers)
 
 
-OS=`uname`
-INSTALL_DIR='/install'
-ESSL_DIR=$essldir
-
-if [ -z "$ESSL_DIR" ]; then
-   # try to default
-   ESSL_DIR=$INSTALL_DIR/post/otherpkgs/$OSVER/$ARCH/essl
-fi
-
-
-
-if [ $OS != "AIX" ]; then
-    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
-    #  Being run from a stateful install postscript
-    #  Copy rpms directly from the xCAT management node and install        
-        mkdir -p /tmp/essl
-        rm -f -R /tmp/essl/*
-        cd /tmp/essl
-        download_dir=`echo $ESSL_DIR | cut -d '/' -f3-`
-        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=5 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
-        #rpm -Uvh essl.license*.rpm
-        IBM_ESSL_LICENSE_ACCEPT=yes rpm -Uvh essl*.rpm
-        #install_essl=`find /opt/ibmmath/essl -name install_essl -print`
-        #if [ -n "$install_essl" ] ; then
-        #    $install_essl -y -d . -nodocs
-        #fi
-        #rpm -Uvh pessl.license*.rpm
-        IBM_PESSL_LICENSE_ACCEPT=yes rpm -Uvh pessl*.rpm
-        #install_pessl=`find /opt/ibmmath/pessl -name install_pessl -print`
-        #if [ -n "$install_pessl" ] ; then
-        #    $install_pessl -y -d . -nodocs
-        #fi
-        rm -Rf /tmp/essl
-    fi
-
-    if [ $NODESETSTATE == "genimage" ]; then
-    # Being called from <image>.postinstall script
-    # Assume we are on the same machine
-        tmpdir=tmpessl
-        mkdir $installroot/$tmpdir
-        cp -p $ESSL_DIR/* $installroot/$tmpdir
-        #rpm --root $installroot -Uvh $installroot/$tmpdir/essl.license*.rpm
-        IBM_ESSL_LICENSE_ACCEPT=yes rpm --root $installroot -Uvh $installroot/$tmpdir/essl*.rpm
-        cd $installroot
-        #install_essl=`find opt/ibmmath/essl -name install_essl -print`
-        #if [ -n "$install_essl" ] ; then
-        #    chroot $installroot /$install_essl -y -nodocs -d /$tmpdir
-        #fi
-        #rpm --root  $installroot -Uvh $installroot/$tmpdir/pessl.license*.rpm
-        IBM_PESSL_LICENSE_ACCEPT=yes rpm --root  $installroot -Uvh $installroot/$tmpdir/pessl*.rpm
-        #install_pessl=`find opt/ibmmath/pessl -name install_pessl -print`
-        #if [ -n "$install_pessl" ] ; then
-        #    chroot $installroot /$install_pessl -y -nodocs -d /$tmpdir
-        #fi
-        rm -rf $installroot/$tmpdir
-    fi
-fi  
-
-
+#OS=`uname`
+#INSTALL_DIR='/install'
+#ESSL_DIR=$essldir
+#
+#if [ -z "$ESSL_DIR" ]; then
+#   # try to default
+#   ESSL_DIR=$INSTALL_DIR/post/otherpkgs/$OSVER/$ARCH/essl
+#fi
+#
+#
+#
+#if [ $OS != "AIX" ]; then
+#    if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ]; then
+#    #  Being run from a stateful install postscript
+#    #  Copy rpms directly from the xCAT management node and install        
+#        mkdir -p /tmp/essl
+#        rm -f -R /tmp/essl/*
+#        cd /tmp/essl
+#        download_dir=`echo $ESSL_DIR | cut -d '/' -f3-`
+#        wget -l inf -N -r --waitretry=10 --random-wait --retry-connrefused -t 10 -T 60 -nH --cut-dirs=5 ftp://$SITEMASTER/$download_dir/*.rpm 2> /tmp/wget.log
+#        #rpm -Uvh essl.license*.rpm
+#        IBM_ESSL_LICENSE_ACCEPT=yes rpm -Uvh essl*.rpm
+#        #install_essl=`find /opt/ibmmath/essl -name install_essl -print`
+#        #if [ -n "$install_essl" ] ; then
+#        #    $install_essl -y -d . -nodocs
+#        #fi
+#        #rpm -Uvh pessl.license*.rpm
+#        IBM_PESSL_LICENSE_ACCEPT=yes rpm -Uvh pessl*.rpm
+#        #install_pessl=`find /opt/ibmmath/pessl -name install_pessl -print`
+#        #if [ -n "$install_pessl" ] ; then
+#        #    $install_pessl -y -d . -nodocs
+#        #fi
+#        rm -Rf /tmp/essl
+#    fi
+#
+#    if [ $NODESETSTATE == "genimage" ]; then
+#    # Being called from <image>.postinstall script
+#    # Assume we are on the same machine
+#        tmpdir=tmpessl
+#        mkdir $installroot/$tmpdir
+#        cp -p $ESSL_DIR/* $installroot/$tmpdir
+#        #rpm --root $installroot -Uvh $installroot/$tmpdir/essl.license*.rpm
+#        IBM_ESSL_LICENSE_ACCEPT=yes rpm --root $installroot -Uvh $installroot/$tmpdir/essl*.rpm
+#        cd $installroot
+#        #install_essl=`find opt/ibmmath/essl -name install_essl -print`
+#        #if [ -n "$install_essl" ] ; then
+#        #    chroot $installroot /$install_essl -y -nodocs -d /$tmpdir
+#        #fi
+#        #rpm --root  $installroot -Uvh $installroot/$tmpdir/pessl.license*.rpm
+#        IBM_PESSL_LICENSE_ACCEPT=yes rpm --root  $installroot -Uvh $installroot/$tmpdir/pessl*.rpm
+#        #install_pessl=`find opt/ibmmath/pessl -name install_pessl -print`
+#        #if [ -n "$install_pessl" ] ; then
+#        #    chroot $installroot /$install_pessl -y -nodocs -d /$tmpdir
+#        #fi
+#        rm -rf $installroot/$tmpdir
+#    fi
+#fi  
+#
+#