arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merging essl/pessl updates from 2.7 to trunk

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12866 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2012-05-22 08:53:36 +00:00
parent 65a9d7e448
commit e0514266f5
2 changed files with 65 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist
View File

@ -1 +1,7 @@
essl/ibm-java2-ppc64-jre
#ENV:IBM_ESSL_LICENSE_ACCEPT=yes#
essl/essl*
#ENV:IBM_PESSL_LICENSE_ACCEPT=yes#
essl/pessl*

118
xCAT-IBMhpc/share/xcat/IBMhpc/essl/essl_install_pessl4100
View File

@ -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
#
#