From 9127757c0089dd08db4bbf080ef84a5a34ef32b9 Mon Sep 17 00:00:00 2001 From: mellor Date: Thu, 13 May 2010 18:22:17 +0000 Subject: [PATCH] add rsct to Linux HPC integration (already installed with AIX) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6088 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../xcat/IBMhpc/compute.sles11.ppc64.exlist | 1 + .../compute.sles11.ppc64.otherpkgs.pkglist | 4 +++ .../xcat/IBMhpc/compute.sles11.ppc64.pkglist | 1 + .../IBMhpc/compute.sles11.ppc64.postinstall | 4 +++ .../share/xcat/IBMhpc/rsct/rsct.exlist | 18 ++++++++++ .../xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist | 7 ++++ .../share/xcat/IBMhpc/rsct/rsct.pkglist | 1 + .../share/xcat/IBMhpc/rsct/rsct_install | 36 +++++++++++++++++++ 8 files changed, 72 insertions(+) create mode 100755 xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist create mode 100755 xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist create mode 100755 xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.pkglist create mode 100755 xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.exlist index f9dfab1bd..181aaaef1 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.exlist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.exlist @@ -7,3 +7,4 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.exlist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.exlist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.exlist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/rsct/rsct.exlist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist index eb0e6c614..52fd9f754 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist @@ -7,3 +7,7 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist# + +# For full-disk (stateful) images, EDIT below to use rsct.otherpkgs +# For diskless, rpms are installed with postinstall script +#do not INCLUDE:/opt/xcat/share/xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.pkglist index 935444467..1655ea171 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.pkglist @@ -6,5 +6,6 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/essl.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/rsct/rsct.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall index df1f47cfd..ffdd993c5 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall @@ -53,3 +53,7 @@ installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/es # and do some config installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install +# Run script to install RSCT rpms +installroot=$installroot rsctdir=$otherpkgs/rsct NODESETSTATE=genimage $hpc/rsct/rsct_install + + diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist new file mode 100755 index 000000000..95476f8fb --- /dev/null +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.exlist @@ -0,0 +1,18 @@ ++./usr/lib/perl5* +./usr/include/rsct/* +./usr/sbin/rsct/README +./usr/sbin/rsct/include* +./usr/sbin/rsct/man/* +./usr/sbin/rsct/bin/trap2rmcd +./usr/sbin/rsct/bin/ctadmingroup +./usr/sbin/rsct/bin/mkcdef + +#java interface +./usr/sbin/rsct/lib/java.exp +./usr/sbin/rsct/lib/librmcjni.so +./usr/sbin/rsct/lib/librmcjni.so.exp +./usr/sbin/rsct/lib/libutiljni.so +./usr/sbin/rsct/lib/libutiljni.so.exp +./usr/sbin/rsct/codebase* + + diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist new file mode 100755 index 000000000..acc8e3e39 --- /dev/null +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.otherpkgs.pkglist @@ -0,0 +1,7 @@ +# RSCT rpms +# Use this pkglist ONLY for full-disk install (stateful) images +# The rsct_install postscript will install the rpms into +# diskless/statelite images with genimage +rsct/rsct.core +rsct/rsct.core.utils +rsct/src diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.pkglist new file mode 100755 index 000000000..21d55f92f --- /dev/null +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct.pkglist @@ -0,0 +1 @@ +uuid-runtime diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install new file mode 100755 index 000000000..3130ddd04 --- /dev/null +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/rsct/rsct_install @@ -0,0 +1,36 @@ +#!/bin/sh + +# +# Sample script to accept licenses and install RSCT packages +# For AIX: +# do nothing - RSCT gets installed with base AIX +# For Linux: +# install the rsct rpms + + +OS=`uname` +INSTALL_DIR='/install' +RSCT_DIR=$rsctdir + +if [ -z "$RSCT_DIR" ]; then + # try to default + RSCT_DIR=$INSTALL_DIR/post/otherpkgs/$OSVER/$ARCH/rsct +fi + + + +if [ $OS != "AIX" ]; then + # if [ $NODESETSTATE == "install" ] || [ $NODESETSTATE == "boot" ] ; then + # Being run from a stateful install postscript + # Do nothing - use rsct.otherpkgs.pkglist to install the + # rsct rpms +# fi + + if [ $NODESETSTATE == "genimage" ]; then + # Being called from .postinstall script + # Assume we are on the same machine + INUCLIENTS=1 INUBOSTYPE=1 rpm --root $installroot --force -Uvh $RSCT_DIR/src-* $RSCT_DIR/rsct.core-* $RSCT_DIR/rsct.core.utils-* + fi +fi + +