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 001288b92..91c8ca266 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.otherpkgs.pkglist @@ -2,4 +2,4 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/compilers/compilers.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.ppc64.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/essl/essl.otherpkgs.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.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 3007dc20e..916957641 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-1200.ppc64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.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 5da81c542..6a112f71b 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.ppc64.postinstall @@ -59,7 +59,7 @@ installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/es # 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-5103 # 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/compute.rhels6.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.rhels6.x86_64.otherpkgs.pkglist index 9458b5c60..c4ebb4cdc 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,3 +1,3 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.x86_64.otherpkgs.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.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 c731b4845..6cbc33e63 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-1200.x86_64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.rhels6.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 0dc097c07..1147a189c 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-5103 # Run script to install RSCT rpms. Not available on x86_64 #installroot=$installroot rsctdir=$otherpkgs/rsct NODESETSTATE=genimage $hpc/rsct/rsct_install 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 52fd9f754..60208da41 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.otherpkgs.pkglist @@ -6,7 +6,7 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.otherpkgs.pkglist# #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# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist# # For full-disk (stateful) images, EDIT below to use rsct.otherpkgs # For diskless, rpms are installed with postinstall script diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.pkglist index 41130b984..5062fba54 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.pkglist @@ -4,7 +4,7 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.sles11.ppc64.pkglist# #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/pe/pe-1200.sles11.ppc64.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 b36a6db4c..e02526849 100755 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.ppc64.postinstall @@ -60,7 +60,7 @@ installroot=$installroot essldir=$otherpkgs/essl NODESETSTATE=genimage $hpc/es # 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-5103 # 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/compute.sles11.x86_64.otherpkgs.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist index a89726c45..77159fbd5 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.otherpkgs.pkglist @@ -1,3 +1,3 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/gpfs/gpfs.x86_64.otherpkgs.pkglist# #INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.otherpkgs.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl.otherpkgs.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/loadl/loadl-5103.otherpkgs.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist index c92adfe12..1f7c1b602 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.pkglist @@ -1,2 +1,2 @@ #INCLUDE:/opt/xcat/share/xcat/IBMhpc/IBMhpc.sles11.x86_64.pkglist# -#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.x86_64.pkglist# +#INCLUDE:/opt/xcat/share/xcat/IBMhpc/pe/pe-1200.sles11.x86_64.pkglist# diff --git a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall index 0e4ede8cb..3748172fc 100644 --- a/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.x86_64.postinstall +++ b/xCAT-IBMhpc/share/xcat/IBMhpc/compute.sles11.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-5103 # Run script to install RSCT rpms. Not available on x86_64 #installroot=$installroot rsctdir=$otherpkgs/rsct NODESETSTATE=genimage $hpc/rsct/rsct_install