From 94d0e7c1e62ea1b244bb9768d27a0c14958342cc Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Fri, 30 Mar 2012 06:33:32 +0000 Subject: [PATCH] Top level update in hpc integration to include the latest pkglist, otherpkgs and postinstalls. Also changed the way to install hpc apps from postinstall to otherpkgs. PE and GPFS otherpkg list have been added the pkg names. PE and GPFS postinstall script have removed package installation part. LoadL otherpkg and postintall don't do any change since only full license rpm needs to install by xCAT, other Loadl packages are still installed from their own script, so moving loadl license rpm from postinstall to otherpkg might add more work to user, we can simply do it from postinstall. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12072 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist | 2 +- xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist | 2 +- .../share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall | 2 +- .../xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist | 5 +++-- xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist | 2 +- .../share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist index 213abcdb6..b45e791a6 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist @@ -1,5 +1,5 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.otherpkgs.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.ppc64.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist index 073905a1a..3007dc20e 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.pkglist @@ -1,3 +1,3 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhels6.ppc64.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.rhels6.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.ppc64.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.rhels6.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall index 1f5fd228c..5da81c542 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall @@ -50,7 +50,7 @@ installroot=$installroot NODESETSTATE=genimage $hpc/compilers/compilers_licens # Run script to install PE and accept license -installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_install +installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_install-1200 # Run script to install ESSL and PESSL rpms diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist index 9d74dbdfe..59190cd0d 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist @@ -1,2 +1,3 @@ -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.rhels6.x86_64.otherpkgs.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.rhels6.x86_64.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.x86_64.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist index e8242401e..c731b4845 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.pkglist @@ -1,2 +1,2 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.rhels6.x86_64.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe.rhels6.x86_64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall index a7c934f2a..0dc097c07 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.postinstall @@ -59,7 +59,7 @@ installroot=$installroot pedir=$otherpkgs/pe NODESETSTATE=genimage $hpc/pe/pe_ # Run script to accept LoadLeveler license, install product rpms, # and do some config -#installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install +installroot=$installroot loadldir=$otherpkgs/loadl NODESETSTATE=genimage $hpc/loadl/loadl_install # Run script to install RSCT rpms. Not available on x86_64 #installroot=$installroot rsctdir=$otherpkgs/rsct NODESETSTATE=genimage $hpc/rsct/rsct_install