diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit index 98c13f004..1a159f257 100755 --- a/xCAT-buildkit/bin/buildkit +++ b/xCAT-buildkit/bin/buildkit @@ -1737,7 +1737,6 @@ sub build_kitcomp } if ( !$::NON_NATIVE_PKGS->{$comp->{kitcompname}}{$kcmetaname} ) { $cmd = "cd $tmpdir/..;mv $comp->{kitcompname} $comp->{basename}; tar -czf $rpmbuild_dir/SOURCES/$comp->{basename}.tar.gz $comp->{basename};mv $comp->{basename} $comp->{kitcompname}"; - $::HAVE_NON_NATIVE_PKGS = 1; if ( system($cmd) ) { print "Error creating tarfile $rpmbuild_dir/SOURCES/$comp->{kitreponame}-$comp->{kitcompname}.tar from $sourcedir/*"; return 1; @@ -1992,6 +1991,7 @@ sub create_kitconf foreach my $pkgfile (split(/,/, $kc->{non_native_pkgs})) { my ($key,$value) = split /:/,$pkgfile; if ("$key" =~ /EXTERNALPKGS/) { + $::HAVE_NON_NATIVE_PKGS = 1; my %current_entry; $current_entry{filename} = $value; $current_entry{kitcompname} = $kc->{kitcompname}; diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/buildkit.conf index a7a793398..4b58a1cbc 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/buildkit.conf @@ -59,7 +59,6 @@ kitrepo: osmajorversion=11 osarch=ppc64 - # kitcomponent: This section defines one Kit Component. # There can be zero or more kitcomponent sections. # If you want to build a component which supports multiple OSes, @@ -95,7 +94,7 @@ kitrepo: # kitpackage section. Each package must be in the same # kitrepo as this kit component. # non_native_pkgs (optional) TBD -- NOT SUPPORTED YET! -# Comma-separated list of non-native package +# Comma-separated list of non_native package # paths that will be included as files in this kit # component. All filenames are relative to # /source_packages @@ -115,121 +114,138 @@ kitcomponent: basename=gpfs_compute description=GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 + #non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* #driverpacks= exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_loginnode description=GPFS for login nodes version=3.5.0 - release=s009 + release=6 serverroles=loginnode kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storagenode description=GPFS for storage nodes version=3.5.0 - release=s009 - serverroles=storagenode + release=6 + serverroles=storagenode,servicenode kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates_storage + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_compute description=GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=sles11_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 ,gpfs.docs >= 3.5.0,gpfs.gnr >= 3.5.0 + #non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=sles11_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gnr >= 3.5.0 + #non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* #driverpacks= exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_loginnode description=GPFS for login nodes version=3.5.0 - release=s009 + release=6 serverroles=loginnode kitrepoid=sles11_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.gnr >= 3.5.0 + #non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storagenode description=GPFS for storage nodes version=3.5.0 - release=s009 - serverroles=storagenode + release=6 + serverroles=storagenode,servicenode kitrepoid=sles11_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.gnr >= 3.5.0 + #non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates_storage + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + # kitpackage: This section defines one Kit Package, and how to build it. @@ -307,7 +323,8 @@ kitpackage: rpm_prebuiltdir=base kitpackage: - filename=gpfs.gplbin-3.5.0-6.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - isexternalpkg=yes - + filename=gpfs.gnr-3.5.0-6.sles.ppc64.rpm + kitrepoid=sles11_ppc64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir=base diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_config b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_config new file mode 100755 index 000000000..9850b01b6 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_config @@ -0,0 +1,65 @@ +#!/bin/sh + +# +# Sample script to install and configure GPFS +# For AIX: +# Assumes the GPFS filesets and updates were installed using +# xCAT bundle files or some other mechanism. This script does not +# install additional software. +# It will do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile +# For Linux: +# Assumes the base GPFS rpms were installed with the xCAT 'otherpkgs' +# postscript (stateful install) or with the otherpkgs processing of +# genimage (stateless/statelite install). This script will install any +# gpfs update rpms that exist on the xCAT management node in the +# /install/post/gpfs_updates directory. +# This is necessary because the GPFS updates can ONLY be installed +# after the base rpms have been installed, and the update rpms cannot +# exist in any rpm repositories used by xCAT otherpkgs processing +# since they will confuse rpm tools such as zypper and yum. +# This script will also do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile + +OS=`uname` + +# Create an empty nsddevices script for GPFS +# This assumes that the node is NOT an NSD server +if [ $OS != "AIX" ]; then + # Create the script on the node + mkdir -p /var/mmfs/etc + echo 'return 0' > /var/mmfs/etc/nsddevices + chmod 744 /var/mmfs/etc/nsddevices +fi + + +# Add GPFS path to profile +if [ $OS != "AIX" ]; then + gpfsprofile=/etc/profile.d/gpfs + if [ ! -f "/proc/cmdline" ]; then + gpfsprofile=$gpfsprofile + fi + if [ ! -e $gpfsprofile.sh ]; then + echo 'export PATH=$PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.sh + echo 'setenv PATH $PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.csh + # Turn off LANG support since we did not install other msg catalogs + echo 'export LC_CTYPE=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_CTYPE POSIX' >> $gpfsprofile.csh + echo 'export LC_ALL=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_ALL POSIX' >> $gpfsprofile.csh + chmod 744 $gpfsprofile.sh + chmod 744 $gpfsprofile.csh + fi +fi + +# If you are using a shared home directory stored in GPFS, +# create the symbolic link +# +# GPFSHOME=/gpfs/home +# HOMEDIR=/u +# ln -s $GPFSHOME $HOMEDIR + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_config_storage b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_config_storage new file mode 100755 index 000000000..59a9befc9 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_config_storage @@ -0,0 +1,65 @@ +#!/bin/sh + +# +# Sample script to install and configure GPFS +# For AIX: +# Assumes the GPFS filesets and updates were installed using +# xCAT bundle files or some other mechanism. This script does not +# install additional software. +# It will do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile +# For Linux: +# Assumes the base GPFS rpms were installed with the xCAT 'otherpkgs' +# postscript (stateful install) or with the otherpkgs processing of +# genimage (stateless/statelite install). This script will install any +# gpfs update rpms that exist on the xCAT management node in the +# /install/post/gpfs_updates directory. +# This is necessary because the GPFS updates can ONLY be installed +# after the base rpms have been installed, and the update rpms cannot +# exist in any rpm repositories used by xCAT otherpkgs processing +# since they will confuse rpm tools such as zypper and yum. +# This script will also do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile + +OS=`uname` + +## Create an empty nsddevices script for GPFS +## This assumes that the node is NOT an NSD server +#if [ $OS != "AIX" ]; then +# # Create the script on the node +# mkdir -p /var/mmfs/etc +# echo 'return 0' > /var/mmfs/etc/nsddevices +# chmod 744 /var/mmfs/etc/nsddevices +#fi + + +# Add GPFS path to profile +if [ $OS != "AIX" ]; then + gpfsprofile=/etc/profile.d/gpfs + if [ ! -f "/proc/cmdline" ]; then + gpfsprofile=$gpfsprofile + fi + if [ ! -e $gpfsprofile.sh ]; then + echo 'export PATH=$PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.sh + echo 'setenv PATH $PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.csh + # Turn off LANG support since we did not install other msg catalogs + echo 'export LC_CTYPE=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_CTYPE POSIX' >> $gpfsprofile.csh + echo 'export LC_ALL=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_ALL POSIX' >> $gpfsprofile.csh + chmod 744 $gpfsprofile.sh + chmod 744 $gpfsprofile.csh + fi +fi + +# If you are using a shared home directory stored in GPFS, +# create the symbolic link +# +# GPFSHOME=/gpfs/home +# HOMEDIR=/u +# ln -s $GPFSHOME $HOMEDIR + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_mmsdrfs b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_mmsdrfs new file mode 100755 index 000000000..9bf7c31ba --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_mmsdrfs @@ -0,0 +1,38 @@ +#!/bin/sh +# xCAT postscript to configure GPFS on a stateless node. +# Before booting nodes with this postscript, gpfs must be up and configured correctly on the node +# pointed to by the -p flag below. The $MASTER environment variable will be set by xCAT to +# the service node or management node of this booting node. If you want the nodes to get their +# GPFS configuration from a different node, replace $MASTER with that IP address. + + +# The source server:location of the mmsdrfs file. Default is this xCAT MN. +#SOURCE=gpfsmgr:/var/mmfs/gen/mmsdrfs +SOURCE=/var/mmfs/gen/mmsdrfs + +# The gpfsmgr which save the mmsdrfs file. generally it is XCATMASTER +GPFSMGR=$MASTER + +if [[ ! -z "$installroot" ]]; then + OS=`uname` + if [[ "$OS" != "AIX" ]]; then + rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs + if [[ $? != 0 ]] + then + echo "Error: rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs failed. Please make sure GPFS is configured correctly!" + else + echo "rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs succeed" + fi + exit + fi +else + cmd="/usr/lpp/mmfs/bin/mmsdrrestore -p $GPFSMGR -R /usr/bin/scp&" + $cmd > /dev/null 2>&1 + if [[ $? != 0 ]] + then + echo "mmsdrrestore failed!" + exit 2 + else + echo "mmsdrrestore succeeded" + fi +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_start b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_start new file mode 100755 index 000000000..18bd1d1ee --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_start @@ -0,0 +1,11 @@ +#!/bin/sh + +# Run this script as a postscript on any node (stateless, statefull, +# full-disk install, AIX, Linux) to start the GPFS daemon +# + +# If you have any special network dependencies, you may want to add code +# to check them first + +/usr/lpp/mmfs/bin/mmstartup + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_update new file mode 100755 index 000000000..436a2be92 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/other_files/gpfs_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ -n $installroot ]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/rpm b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/rpm new file mode 100644 index 000000000..e69de29bb diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_mmsdrfs b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_mmsdrfs index fa4dab455..9bf7c31ba 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_mmsdrfs +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_mmsdrfs @@ -4,12 +4,35 @@ # pointed to by the -p flag below. The $MASTER environment variable will be set by xCAT to # the service node or management node of this booting node. If you want the nodes to get their # GPFS configuration from a different node, replace $MASTER with that IP address. -cmd="/usr/lpp/mmfs/bin/mmsdrrestore -p $MASTER -R /usr/bin/scp" -$cmd > /dev/null 2>&1 -if [[ $? != 0 ]] -then + + +# The source server:location of the mmsdrfs file. Default is this xCAT MN. +#SOURCE=gpfsmgr:/var/mmfs/gen/mmsdrfs +SOURCE=/var/mmfs/gen/mmsdrfs + +# The gpfsmgr which save the mmsdrfs file. generally it is XCATMASTER +GPFSMGR=$MASTER + +if [[ ! -z "$installroot" ]]; then + OS=`uname` + if [[ "$OS" != "AIX" ]]; then + rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs + if [[ $? != 0 ]] + then + echo "Error: rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs failed. Please make sure GPFS is configured correctly!" + else + echo "rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs succeed" + fi + exit + fi +else + cmd="/usr/lpp/mmfs/bin/mmsdrrestore -p $GPFSMGR -R /usr/bin/scp&" + $cmd > /dev/null 2>&1 + if [[ $? != 0 ]] + then echo "mmsdrrestore failed!" exit 2 -else + else echo "mmsdrrestore succeeded" - + fi +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_start b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_start index 21f50dd00..18bd1d1ee 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_start +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_start @@ -7,6 +7,5 @@ # If you have any special network dependencies, you may want to add code # to check them first -/usr/lpp/mmfs/bin/mmsdrrestore /usr/lpp/mmfs/bin/mmstartup diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/buildkit.conf index 33d186f81..b3f4f455f 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/buildkit.conf @@ -23,7 +23,7 @@ kit: basename=gpfs description=General Parallel File System - version=3.5.0 + version=3.5.0-6 ostype=Linux #kitdeployparams= @@ -59,7 +59,6 @@ kitrepo: osmajorversion=11 osarch=x86_64 - # kitcomponent: This section defines one Kit Component. # There can be zero or more kitcomponent sections. # If you want to build a component which supports multiple OSes, @@ -95,7 +94,7 @@ kitrepo: # kitpackage section. Each package must be in the same # kitrepo as this kit component. # non_native_pkgs (optional) TBD -- NOT SUPPORTED YET! -# Comma-separated list of non-native package +# Comma-separated list of non_native package # paths that will be included as files in this kit # component. All filenames are relative to # /source_packages @@ -115,121 +114,130 @@ kitcomponent: basename=gpfs_compute description=GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=rhels6_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=rhels6_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 #driverpacks= exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_loginnode description=GPFS for login nodes version=3.5.0 - release=s009 + release=6 serverroles=loginnode kitrepoid=rhels6_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storagenode description=GPFS for storage nodes version=3.5.0 - release=s009 - serverroles=storagenode + release=6 + serverroles=storagenode,servicenode kitrepoid=rhels6_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates_storage + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_compute description=GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=sles11_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 ,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=sles11_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 #driverpacks= exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_loginnode description=GPFS for login nodes version=3.5.0 - release=s009 + release=6 serverroles=loginnode kitrepoid=sles11_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storagenode description=GPFS for storage nodes version=3.5.0 - release=s009 - serverroles=storagenode + release=6 + serverroles=storagenode,servicenode kitrepoid=sles11_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= - exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates_storage + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + # kitpackage: This section defines one Kit Package, and how to build it. @@ -307,7 +315,15 @@ kitpackage: rpm_prebuiltdir=base kitpackage: - filename=gpfs.gplbin-3.5.0-6.x86_64.rpm + filename=gpfs.src-3.5.0-6.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 - isexternalpkg=yes + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir=base +kitpackage: + filename=gpfs.libsrc-3.5.0-6.noarch.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir=base diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_mmsdrfs b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_mmsdrfs index fa4dab455..9bf7c31ba 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_mmsdrfs +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_mmsdrfs @@ -4,12 +4,35 @@ # pointed to by the -p flag below. The $MASTER environment variable will be set by xCAT to # the service node or management node of this booting node. If you want the nodes to get their # GPFS configuration from a different node, replace $MASTER with that IP address. -cmd="/usr/lpp/mmfs/bin/mmsdrrestore -p $MASTER -R /usr/bin/scp" -$cmd > /dev/null 2>&1 -if [[ $? != 0 ]] -then + + +# The source server:location of the mmsdrfs file. Default is this xCAT MN. +#SOURCE=gpfsmgr:/var/mmfs/gen/mmsdrfs +SOURCE=/var/mmfs/gen/mmsdrfs + +# The gpfsmgr which save the mmsdrfs file. generally it is XCATMASTER +GPFSMGR=$MASTER + +if [[ ! -z "$installroot" ]]; then + OS=`uname` + if [[ "$OS" != "AIX" ]]; then + rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs + if [[ $? != 0 ]] + then + echo "Error: rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs failed. Please make sure GPFS is configured correctly!" + else + echo "rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs succeed" + fi + exit + fi +else + cmd="/usr/lpp/mmfs/bin/mmsdrrestore -p $GPFSMGR -R /usr/bin/scp&" + $cmd > /dev/null 2>&1 + if [[ $? != 0 ]] + then echo "mmsdrrestore failed!" exit 2 -else + else echo "mmsdrrestore succeeded" - + fi +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_start b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_start index 21f50dd00..18bd1d1ee 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_start +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_start @@ -7,6 +7,5 @@ # If you have any special network dependencies, you may want to add code # to check them first -/usr/lpp/mmfs/bin/mmsdrrestore /usr/lpp/mmfs/bin/mmstartup diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/buildkit.conf index cb5dfd038..1ef8dd9c7 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/buildkit.conf @@ -23,7 +23,7 @@ kit: basename=gpfs description=General Parallel File System - version=3.5.0 + version=3.5.0-6 ostype=Linux #kitdeployparams= @@ -59,7 +59,6 @@ kitrepo: osmajorversion=11 osarch=ppc64 - # kitcomponent: This section defines one Kit Component. # There can be zero or more kitcomponent sections. # If you want to build a component which supports multiple OSes, @@ -95,7 +94,7 @@ kitrepo: # kitpackage section. Each package must be in the same # kitrepo as this kit component. # non_native_pkgs (optional) TBD -- NOT SUPPORTED YET! -# Comma-separated list of non-native package +# Comma-separated list of non_native package # paths that will be included as files in this kit # component. All filenames are relative to # /source_packages @@ -115,122 +114,139 @@ kitcomponent: basename=gpfs_compute description=GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #non_native_pkgs=update #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 + #non_native_pkgs=update #driverpacks= exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_loginnode description=GPFS for login nodes version=3.5.0 - release=s009 + release=6 serverroles=loginnode kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #non_native_pkgs=update #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storagenode description=GPFS for storage nodes version=3.5.0 - release=s009 - serverroles=storagenode + release=6 + serverroles=storagenode,servicenode kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #non_native_pkgs=update #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates_storage + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_compute description=GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=sles11_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 ,gpfs.docs >= 3.5.0,gpfs.gnr >= 3.5.0 + #non_native_pkgs=update #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=sles11_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gnr >= 3.5.0 + #non_native_pkgs=update #driverpacks= exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates - + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_loginnode description=GPFS for login nodes version=3.5.0 - release=s009 + release=6 serverroles=loginnode kitrepoid=sles11_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.gnr >= 3.5.0 + #non_native_pkgs=update #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storagenode description=GPFS for storage nodes version=3.5.0 - release=s009 - serverroles=storagenode + release=6 + serverroles=storagenode,servicenode kitrepoid=sles11_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.gnr >= 3.5.0 + #non_native_pkgs=update #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates_storage + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + + # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. @@ -268,7 +284,7 @@ kitcomponent: # or whether the customer will need to separately # obtain the RPM pacakage and add it to the kit tar file # using 'buildkit addpkgs' -# rpm_prebuiltdir: If isexternalpkg=no, path to directory +# rpm_prebuiltdir: If isexternalpkg=yes, path to directory # containing pre-built RPM package # 2. Build RPM from spec + src dir # rpm_spec: Path to spec file. @@ -281,25 +297,39 @@ kitcomponent: kitpackage: filename=gpfs.base-3.5.0-6.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: filename=gpfs.gpl-3.5.0-6.noarch.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: filename=gpfs.docs-3.5.0-6.noarch.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: filename=gpfs.msg.en_US-3.5.0-6.noarch.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: - filename=gpfs.gplbin-3.5.0-6.ppc64.rpm + filename=gpfs.gnr-3.5.0-6.sles.ppc64.rpm + kitrepoid=sles11_ppc64 + # Method 1: Use pre-built RPM package + isexternalpkg=yes + + +kitpackage: + filename=gpfs.gplbin*.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 isexternalpkg=yes - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_config b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_config new file mode 100755 index 000000000..9850b01b6 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_config @@ -0,0 +1,65 @@ +#!/bin/sh + +# +# Sample script to install and configure GPFS +# For AIX: +# Assumes the GPFS filesets and updates were installed using +# xCAT bundle files or some other mechanism. This script does not +# install additional software. +# It will do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile +# For Linux: +# Assumes the base GPFS rpms were installed with the xCAT 'otherpkgs' +# postscript (stateful install) or with the otherpkgs processing of +# genimage (stateless/statelite install). This script will install any +# gpfs update rpms that exist on the xCAT management node in the +# /install/post/gpfs_updates directory. +# This is necessary because the GPFS updates can ONLY be installed +# after the base rpms have been installed, and the update rpms cannot +# exist in any rpm repositories used by xCAT otherpkgs processing +# since they will confuse rpm tools such as zypper and yum. +# This script will also do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile + +OS=`uname` + +# Create an empty nsddevices script for GPFS +# This assumes that the node is NOT an NSD server +if [ $OS != "AIX" ]; then + # Create the script on the node + mkdir -p /var/mmfs/etc + echo 'return 0' > /var/mmfs/etc/nsddevices + chmod 744 /var/mmfs/etc/nsddevices +fi + + +# Add GPFS path to profile +if [ $OS != "AIX" ]; then + gpfsprofile=/etc/profile.d/gpfs + if [ ! -f "/proc/cmdline" ]; then + gpfsprofile=$gpfsprofile + fi + if [ ! -e $gpfsprofile.sh ]; then + echo 'export PATH=$PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.sh + echo 'setenv PATH $PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.csh + # Turn off LANG support since we did not install other msg catalogs + echo 'export LC_CTYPE=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_CTYPE POSIX' >> $gpfsprofile.csh + echo 'export LC_ALL=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_ALL POSIX' >> $gpfsprofile.csh + chmod 744 $gpfsprofile.sh + chmod 744 $gpfsprofile.csh + fi +fi + +# If you are using a shared home directory stored in GPFS, +# create the symbolic link +# +# GPFSHOME=/gpfs/home +# HOMEDIR=/u +# ln -s $GPFSHOME $HOMEDIR + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_config_storage b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_config_storage new file mode 100755 index 000000000..59a9befc9 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_config_storage @@ -0,0 +1,65 @@ +#!/bin/sh + +# +# Sample script to install and configure GPFS +# For AIX: +# Assumes the GPFS filesets and updates were installed using +# xCAT bundle files or some other mechanism. This script does not +# install additional software. +# It will do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile +# For Linux: +# Assumes the base GPFS rpms were installed with the xCAT 'otherpkgs' +# postscript (stateful install) or with the otherpkgs processing of +# genimage (stateless/statelite install). This script will install any +# gpfs update rpms that exist on the xCAT management node in the +# /install/post/gpfs_updates directory. +# This is necessary because the GPFS updates can ONLY be installed +# after the base rpms have been installed, and the update rpms cannot +# exist in any rpm repositories used by xCAT otherpkgs processing +# since they will confuse rpm tools such as zypper and yum. +# This script will also do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile + +OS=`uname` + +## Create an empty nsddevices script for GPFS +## This assumes that the node is NOT an NSD server +#if [ $OS != "AIX" ]; then +# # Create the script on the node +# mkdir -p /var/mmfs/etc +# echo 'return 0' > /var/mmfs/etc/nsddevices +# chmod 744 /var/mmfs/etc/nsddevices +#fi + + +# Add GPFS path to profile +if [ $OS != "AIX" ]; then + gpfsprofile=/etc/profile.d/gpfs + if [ ! -f "/proc/cmdline" ]; then + gpfsprofile=$gpfsprofile + fi + if [ ! -e $gpfsprofile.sh ]; then + echo 'export PATH=$PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.sh + echo 'setenv PATH $PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.csh + # Turn off LANG support since we did not install other msg catalogs + echo 'export LC_CTYPE=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_CTYPE POSIX' >> $gpfsprofile.csh + echo 'export LC_ALL=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_ALL POSIX' >> $gpfsprofile.csh + chmod 744 $gpfsprofile.sh + chmod 744 $gpfsprofile.csh + fi +fi + +# If you are using a shared home directory stored in GPFS, +# create the symbolic link +# +# GPFSHOME=/gpfs/home +# HOMEDIR=/u +# ln -s $GPFSHOME $HOMEDIR + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_mmsdrfs b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_mmsdrfs index fa4dab455..9bf7c31ba 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_mmsdrfs +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_mmsdrfs @@ -4,12 +4,35 @@ # pointed to by the -p flag below. The $MASTER environment variable will be set by xCAT to # the service node or management node of this booting node. If you want the nodes to get their # GPFS configuration from a different node, replace $MASTER with that IP address. -cmd="/usr/lpp/mmfs/bin/mmsdrrestore -p $MASTER -R /usr/bin/scp" -$cmd > /dev/null 2>&1 -if [[ $? != 0 ]] -then + + +# The source server:location of the mmsdrfs file. Default is this xCAT MN. +#SOURCE=gpfsmgr:/var/mmfs/gen/mmsdrfs +SOURCE=/var/mmfs/gen/mmsdrfs + +# The gpfsmgr which save the mmsdrfs file. generally it is XCATMASTER +GPFSMGR=$MASTER + +if [[ ! -z "$installroot" ]]; then + OS=`uname` + if [[ "$OS" != "AIX" ]]; then + rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs + if [[ $? != 0 ]] + then + echo "Error: rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs failed. Please make sure GPFS is configured correctly!" + else + echo "rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs succeed" + fi + exit + fi +else + cmd="/usr/lpp/mmfs/bin/mmsdrrestore -p $GPFSMGR -R /usr/bin/scp&" + $cmd > /dev/null 2>&1 + if [[ $? != 0 ]] + then echo "mmsdrrestore failed!" exit 2 -else + else echo "mmsdrrestore succeeded" - + fi +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_start b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_start index 21f50dd00..18bd1d1ee 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_start +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_start @@ -7,6 +7,5 @@ # If you have any special network dependencies, you may want to add code # to check them first -/usr/lpp/mmfs/bin/mmsdrrestore /usr/lpp/mmfs/bin/mmstartup diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_update new file mode 100755 index 000000000..436a2be92 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-ppc64/scripts/gpfs_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ -n $installroot ]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/buildkit.conf index d4169ddc7..b4bb08c74 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/buildkit.conf @@ -23,7 +23,7 @@ kit: basename=gpfs description=General Parallel File System - version=3.5.0 + version=3.5.0-6 ostype=Linux #kitdeployparams= @@ -59,7 +59,6 @@ kitrepo: osmajorversion=11 osarch=x86_64 - # kitcomponent: This section defines one Kit Component. # There can be zero or more kitcomponent sections. # If you want to build a component which supports multiple OSes, @@ -95,7 +94,7 @@ kitrepo: # kitpackage section. Each package must be in the same # kitrepo as this kit component. # non_native_pkgs (optional) TBD -- NOT SUPPORTED YET! -# Comma-separated list of non-native package +# Comma-separated list of non_native package # paths that will be included as files in this kit # component. All filenames are relative to # /source_packages @@ -115,121 +114,130 @@ kitcomponent: basename=gpfs_compute description=GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=rhels6_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=rhels6_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 #driverpacks= exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_loginnode description=GPFS for login nodes version=3.5.0 - release=s009 + release=6 serverroles=loginnode kitrepoid=rhels6_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storagenode description=GPFS for storage nodes version=3.5.0 - release=s009 - serverroles=storagenode + release=6 + serverroles=storagenode,servicenode kitrepoid=rhels6_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0,gpfs.docs >= 3.4.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates_storage + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_compute description=GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=sles11_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 ,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes version=3.5.0 - release=s009 - serverroles=compute + release=6 + serverroles=compute,servicenode kitrepoid=sles11_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 #driverpacks= exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_loginnode description=GPFS for login nodes version=3.5.0 - release=s009 + release=6 serverroles=loginnode kitrepoid=sles11_x86_64 #kitcompdeps= - #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.gplbin >= 3.5.0,gpfs.docs >= 3.5.0 - #non_native_pkgs= + #ospkgdeps=ksh + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= exlist=gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storagenode description=GPFS for storage nodes version=3.5.0 - release=s009 - serverroles=storagenode + release=6 + serverroles=storagenode,servicenode kitrepoid=sles11_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=gpfs.base >= 3.4.0,gpfs.gpl >= 3.4.0,gpfs.msg.en_US >= 3.4.0,gpfs.gplbin >= 3.4.0 - #non_native_pkgs= + kitpkgdeps=gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0,gpfs.src >= 3.5.0,gpfs.libsrc >= 3.5.0 #driverpacks= - exlist=min-gpfs.exlist - postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_updates_storage + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-6.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + # kitpackage: This section defines one Kit Package, and how to build it. @@ -268,7 +276,7 @@ kitcomponent: # or whether the customer will need to separately # obtain the RPM pacakage and add it to the kit tar file # using 'buildkit addpkgs' -# rpm_prebuiltdir: If isexternalpkg=no, path to directory +# rpm_prebuiltdir: If isexternalpkg=yes, path to directory # containing pre-built RPM package # 2. Build RPM from spec + src dir # rpm_spec: Path to spec file. @@ -281,25 +289,41 @@ kitcomponent: kitpackage: filename=gpfs.base-3.5.0-6.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: filename=gpfs.gpl-3.5.0-6.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: filename=gpfs.docs-3.5.0-6.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: filename=gpfs.msg.en_US-3.5.0-6.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: - filename=gpfs.gplbin-3.5.0-6.x86_64.rpm + filename=gpfs.src-3.5.0-6.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package isexternalpkg=yes + +kitpackage: + filename=gpfs.libsrc-3.5.0-6.noarch.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=yes + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_config b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_config new file mode 100755 index 000000000..9850b01b6 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_config @@ -0,0 +1,65 @@ +#!/bin/sh + +# +# Sample script to install and configure GPFS +# For AIX: +# Assumes the GPFS filesets and updates were installed using +# xCAT bundle files or some other mechanism. This script does not +# install additional software. +# It will do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile +# For Linux: +# Assumes the base GPFS rpms were installed with the xCAT 'otherpkgs' +# postscript (stateful install) or with the otherpkgs processing of +# genimage (stateless/statelite install). This script will install any +# gpfs update rpms that exist on the xCAT management node in the +# /install/post/gpfs_updates directory. +# This is necessary because the GPFS updates can ONLY be installed +# after the base rpms have been installed, and the update rpms cannot +# exist in any rpm repositories used by xCAT otherpkgs processing +# since they will confuse rpm tools such as zypper and yum. +# This script will also do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile + +OS=`uname` + +# Create an empty nsddevices script for GPFS +# This assumes that the node is NOT an NSD server +if [ $OS != "AIX" ]; then + # Create the script on the node + mkdir -p /var/mmfs/etc + echo 'return 0' > /var/mmfs/etc/nsddevices + chmod 744 /var/mmfs/etc/nsddevices +fi + + +# Add GPFS path to profile +if [ $OS != "AIX" ]; then + gpfsprofile=/etc/profile.d/gpfs + if [ ! -f "/proc/cmdline" ]; then + gpfsprofile=$gpfsprofile + fi + if [ ! -e $gpfsprofile.sh ]; then + echo 'export PATH=$PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.sh + echo 'setenv PATH $PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.csh + # Turn off LANG support since we did not install other msg catalogs + echo 'export LC_CTYPE=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_CTYPE POSIX' >> $gpfsprofile.csh + echo 'export LC_ALL=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_ALL POSIX' >> $gpfsprofile.csh + chmod 744 $gpfsprofile.sh + chmod 744 $gpfsprofile.csh + fi +fi + +# If you are using a shared home directory stored in GPFS, +# create the symbolic link +# +# GPFSHOME=/gpfs/home +# HOMEDIR=/u +# ln -s $GPFSHOME $HOMEDIR + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_config_storage b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_config_storage new file mode 100755 index 000000000..59a9befc9 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_config_storage @@ -0,0 +1,65 @@ +#!/bin/sh + +# +# Sample script to install and configure GPFS +# For AIX: +# Assumes the GPFS filesets and updates were installed using +# xCAT bundle files or some other mechanism. This script does not +# install additional software. +# It will do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile +# For Linux: +# Assumes the base GPFS rpms were installed with the xCAT 'otherpkgs' +# postscript (stateful install) or with the otherpkgs processing of +# genimage (stateless/statelite install). This script will install any +# gpfs update rpms that exist on the xCAT management node in the +# /install/post/gpfs_updates directory. +# This is necessary because the GPFS updates can ONLY be installed +# after the base rpms have been installed, and the update rpms cannot +# exist in any rpm repositories used by xCAT otherpkgs processing +# since they will confuse rpm tools such as zypper and yum. +# This script will also do the following: +# - create /var/mmfs/etc/nsddevices that simply returns 0 +# - add GPFS paths to profile + +OS=`uname` + +## Create an empty nsddevices script for GPFS +## This assumes that the node is NOT an NSD server +#if [ $OS != "AIX" ]; then +# # Create the script on the node +# mkdir -p /var/mmfs/etc +# echo 'return 0' > /var/mmfs/etc/nsddevices +# chmod 744 /var/mmfs/etc/nsddevices +#fi + + +# Add GPFS path to profile +if [ $OS != "AIX" ]; then + gpfsprofile=/etc/profile.d/gpfs + if [ ! -f "/proc/cmdline" ]; then + gpfsprofile=$gpfsprofile + fi + if [ ! -e $gpfsprofile.sh ]; then + echo 'export PATH=$PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.sh + echo 'setenv PATH $PATH:/usr/lpp/mmfs/bin' > $gpfsprofile.csh + # Turn off LANG support since we did not install other msg catalogs + echo 'export LC_CTYPE=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_CTYPE POSIX' >> $gpfsprofile.csh + echo 'export LC_ALL=POSIX' >> $gpfsprofile.sh + echo 'setenv LC_ALL POSIX' >> $gpfsprofile.csh + chmod 744 $gpfsprofile.sh + chmod 744 $gpfsprofile.csh + fi +fi + +# If you are using a shared home directory stored in GPFS, +# create the symbolic link +# +# GPFSHOME=/gpfs/home +# HOMEDIR=/u +# ln -s $GPFSHOME $HOMEDIR + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_mmsdrfs b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_mmsdrfs index fa4dab455..9bf7c31ba 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_mmsdrfs +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_mmsdrfs @@ -4,12 +4,35 @@ # pointed to by the -p flag below. The $MASTER environment variable will be set by xCAT to # the service node or management node of this booting node. If you want the nodes to get their # GPFS configuration from a different node, replace $MASTER with that IP address. -cmd="/usr/lpp/mmfs/bin/mmsdrrestore -p $MASTER -R /usr/bin/scp" -$cmd > /dev/null 2>&1 -if [[ $? != 0 ]] -then + + +# The source server:location of the mmsdrfs file. Default is this xCAT MN. +#SOURCE=gpfsmgr:/var/mmfs/gen/mmsdrfs +SOURCE=/var/mmfs/gen/mmsdrfs + +# The gpfsmgr which save the mmsdrfs file. generally it is XCATMASTER +GPFSMGR=$MASTER + +if [[ ! -z "$installroot" ]]; then + OS=`uname` + if [[ "$OS" != "AIX" ]]; then + rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs + if [[ $? != 0 ]] + then + echo "Error: rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs failed. Please make sure GPFS is configured correctly!" + else + echo "rsync -i -t $SOURCE $installroot/var/mmfs/gen/mmsdrfs succeed" + fi + exit + fi +else + cmd="/usr/lpp/mmfs/bin/mmsdrrestore -p $GPFSMGR -R /usr/bin/scp&" + $cmd > /dev/null 2>&1 + if [[ $? != 0 ]] + then echo "mmsdrrestore failed!" exit 2 -else + else echo "mmsdrrestore succeeded" - + fi +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_start b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_start index 21f50dd00..18bd1d1ee 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_start +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_start @@ -7,6 +7,5 @@ # If you have any special network dependencies, you may want to add code # to check them first -/usr/lpp/mmfs/bin/mmsdrrestore /usr/lpp/mmfs/bin/mmstartup diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_update new file mode 100755 index 000000000..4f46bc9a0 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-6-Linux-x86_64/scripts/gpfs_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ -n $installroot ]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-6-rhels-6-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/buildkit.conf index adba774c7..83b0f5594 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/buildkit.conf @@ -23,7 +23,7 @@ kit: basename=pperte description=Parallel Environment Runtime Edition - version=1.2.0.10 + version=1.3.0.0 ostype=Linux kitdeployparams=pe.env @@ -107,13 +107,13 @@ kitrepo: kitcomponent: basename=pperte_compute description=PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) - kitpkgdeps=ppe_rte_license,pperterh6x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -122,13 +122,13 @@ kitcomponent: kitcomponent: basename=min_pperte_compute description=Minimal PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) - kitpkgdeps=ppe_rte_license,pperterh6x >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -137,28 +137,29 @@ kitcomponent: kitcomponent: basename=pperte_loginnode description=PE RTE for login nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=loginnode kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) - kitpkgdeps=ppe_rte_license,pperterh6x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall postbootscripts=pperte_postboot + kitcomponent: basename=pperte_compute description=PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=sles11_ppc64 #kitcompdeps= - ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) - kitpkgdeps=ppe_rte_license,ppertesles11x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -167,13 +168,13 @@ kitcomponent: kitcomponent: basename=min_pperte_compute description=Minimal PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=sles11_ppc64 #kitcompdeps= - ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) - kitpkgdeps=ppe_rte_license,ppertesles11x >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -182,13 +183,13 @@ kitcomponent: kitcomponent: basename=pperte_loginnode description=PE RTE for login nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=loginnode kitrepoid=sles11_ppc64 #kitcompdeps= - ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) - kitpkgdeps=ppe_rte_license,ppertesles11x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -243,87 +244,58 @@ kitcomponent: ### RH6 ppc64 rpms kitpackage: - filename=pperterh6x-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 + filename=pperte-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: - filename=pperteman-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 + filename=pperteman-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: - filename=ppertesamples-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 + filename=ppertesamples-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: - filename=ppe_rte_rh6x_12010-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 + filename=ppe_rte_1300-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: - filename=ppe_rte_man-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 + filename=ppe_rte_man-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: - filename=ppe_rte_samples-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -### SLES11 ppc64 rpms -#kitpackage: -# filename=ppertesles11x-1.2.0.10-s010a.ppc64.rpm -# kitrepoid=sles11_ppc64 -# # Method 1: Use pre-built RPM package -# isexternalpkg=yes - -kitpackage: - filename=pperteman-1.2.0.10-s010a.ppc64.rpm - kitrepoid=sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppertesamples-1.2.0.10-s010a.ppc64.rpm - kitrepoid=sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -#kitpackage: -# filename=ppe_rte_sles11x_12010-1.2.0.10-s010a.ppc64.rpm -# kitrepoid=sles11_ppc64 -# # Method 1: Use pre-built RPM package -# isexternalpkg=yes - -kitpackage: - filename=ppe_rte_man-1.2.0.10-s010a.ppc64.rpm - kitrepoid=sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppe_rte_samples-1.2.0.10-s010a.ppc64.rpm - kitrepoid=sles11_ppc64 + filename=ppe_rte_samples-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes + kitpackage: filename=src-1.3.1.1-12080.ppc.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes + + ### License rpm gets placed in all repos kitpackage: - filename=ppe_rte_license-1.2.0.10-s010a.ppc64.rpm + filename=ppe_rte_license-1.3.0.0-1302a.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/scripts/pperte_postinstall b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/scripts/pperte_postinstall index 541bd3ad1..cab6bafa7 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/scripts/pperte_postinstall +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/scripts/pperte_postinstall @@ -33,5 +33,27 @@ fi # POE requires rsh to be running /bin/sed -i 's/disable.*/disable = no/g' /etc/xinetd.d/rsh if [ -f "/proc/cmdline" ]; then + chkconfig xinetd on service xinetd restart fi + +#max locked memory +if ! grep "max locked memory" /etc/security/limits.conf >/dev/null 2>&1 ; then + sed -i "/# End of file/d" /etc/security/limits.conf + echo "#max locked memory" >> /etc/security/limits.conf + echo "* soft memlock unlimited" >> /etc/security/limits.conf + echo "* hard memlock unlimited" >> /etc/security/limits.conf + echo "# End of file" >> /etc/security/limits.conf +fi + +#max nofile configuration +if ! grep "max nofile" /etc/security/limits.conf >/dev/null 2>&1 ; then + sed -i "/# End of file/d" /etc/security/limits.conf + echo "#max nofile" >> /etc/security/limits.conf + echo "* soft nofile 4096" >> /etc/security/limits.conf + echo "* hard nofile 4096" >> /etc/security/limits.conf + echo "# End of file" >> /etc/security/limits.conf +fi + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/buildkit.conf index 7a5500d37..25995909f 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/buildkit.conf @@ -23,7 +23,7 @@ kit: basename=pperte description=Parallel Environment Runtime Edition - version=1.2.0.10 + version=1.3.0.0 ostype=Linux kitdeployparams=pe.env @@ -107,13 +107,13 @@ kitrepo: kitcomponent: basename=pperte_compute description=PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,pperterh6x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -122,13 +122,13 @@ kitcomponent: kitcomponent: basename=min_pperte_compute description=Minimal PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,pperterh6x >= 1.2.0.10,src + ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -137,28 +137,29 @@ kitcomponent: kitcomponent: basename=pperte_loginnode description=PE RTE for login nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=loginnode kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,pperterh6x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall postbootscripts=pperte_postboot + kitcomponent: basename=pperte_compute description=PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,ppertesles11x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -167,13 +168,13 @@ kitcomponent: kitcomponent: basename=min_pperte_compute description=Minimal PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,ppertesles11x >= 1.2.0.10 + ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -182,13 +183,13 @@ kitcomponent: kitcomponent: basename=pperte_loginnode description=PE RTE for login nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=loginnode kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,ppertesles11x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -243,89 +244,59 @@ kitcomponent: ### RH6 x86_64 rpms kitpackage: - filename=pperterh6x-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=pperteman-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppertesamples-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppe_rte_rh6x_12010-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppe_rte_man-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppe_rte_samples-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -### SLES11 x86_64 rpms -kitpackage: - filename=ppertesles11x-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=pperteman-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppertesamples-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppe_rte_sles11x_12010-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppe_rte_man-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=ppe_rte_samples-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=src-1.3.1.1-12080.i386.rpm + filename=pperte-1.3.0.0-1302a.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes + + +kitpackage: + filename=pperteman-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=yes + + +kitpackage: + filename=ppertesamples-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=yes + + +kitpackage: + filename=ppe_rte_1300-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=yes + + +kitpackage: + filename=ppe_rte_man-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=yes + + +kitpackage: + filename=ppe_rte_samples-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=yes + + +kitpackage: + filename=src-*.i386.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=yes + ### License rpm gets placed in all repos kitpackage: - filename=ppe_rte_license-1.2.0.10-s010a.ppc64.rpm + filename=ppe_rte_license-1.3.0.0-1302a.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes - + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/scripts/pperte_postinstall b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/scripts/pperte_postinstall index 541bd3ad1..cab6bafa7 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/scripts/pperte_postinstall +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/scripts/pperte_postinstall @@ -33,5 +33,27 @@ fi # POE requires rsh to be running /bin/sed -i 's/disable.*/disable = no/g' /etc/xinetd.d/rsh if [ -f "/proc/cmdline" ]; then + chkconfig xinetd on service xinetd restart fi + +#max locked memory +if ! grep "max locked memory" /etc/security/limits.conf >/dev/null 2>&1 ; then + sed -i "/# End of file/d" /etc/security/limits.conf + echo "#max locked memory" >> /etc/security/limits.conf + echo "* soft memlock unlimited" >> /etc/security/limits.conf + echo "* hard memlock unlimited" >> /etc/security/limits.conf + echo "# End of file" >> /etc/security/limits.conf +fi + +#max nofile configuration +if ! grep "max nofile" /etc/security/limits.conf >/dev/null 2>&1 ; then + sed -i "/# End of file/d" /etc/security/limits.conf + echo "#max nofile" >> /etc/security/limits.conf + echo "* soft nofile 4096" >> /etc/security/limits.conf + echo "* hard nofile 4096" >> /etc/security/limits.conf + echo "# End of file" >> /etc/security/limits.conf +fi + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/buildkit.conf index 7456909c0..cafae4965 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/buildkit.conf @@ -23,7 +23,7 @@ kit: basename=pperte description=Parallel Environment Runtime Edition - version=1.2.0.10 + version=1.3.0.0 ostype=Linux kitdeployparams=pe.env @@ -107,13 +107,13 @@ kitrepo: kitcomponent: basename=pperte_compute description=PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) - kitpkgdeps=ppe_rte_license,pperterh6p >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0 exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -122,13 +122,13 @@ kitcomponent: kitcomponent: basename=min_pperte_compute description=Minimal PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) - kitpkgdeps=ppe_rte_license,pperterh6p >= 1.2.0.10,src + ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0 exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -137,62 +137,63 @@ kitcomponent: kitcomponent: basename=pperte_loginnode description=PE RTE for login nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=loginnode kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) - kitpkgdeps=ppe_rte_license,pperterh6p >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0 exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall postbootscripts=pperte_postboot -#kitcomponent: -# basename=pperte_compute -# description=PE RTE for compute nodes -# version=1.2.0.10 -# release=s010a -# serverroles=compute -# kitrepoid=sles11_ppc64 -# #kitcompdeps= -# ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) -# kitpkgdeps=ppe_rte_license,ppertesles11p >= 1.2.0.10,ppe_rte_man >= 1.2.0.10,ppe_rte_samples >= 1.2.0.10,src -# exlist=pe.exlist -# postinstall=pperte_postinstall -# postupgrade=pperte_postinstall -# postbootscripts=pperte_postboot -#kitcomponent: -# basename=pperte_min-compute -# description=Minimal PE RTE for compute nodes -# version=1.2.0.10 -# release=s010a -# serverroles=compute -# kitrepoid=sles11_ppc64 -# #kitcompdeps= -# ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) -# kitpkgdeps=ppe_rte_license,ppertesles11p >= 1.2.0.10,ppe_rte_man >= 1.2.0.10,ppe_rte_samples >= 1.2.0.10,src -# exlist=pe.exlist -# postinstall=pperte_postinstall -# postupgrade=pperte_postinstall -# postbootscripts=pperte_postboot +kitcomponent: + basename=pperte_compute + description=PE RTE for compute nodes + version=1.3.0.0 + release=1302a + serverroles=compute + kitrepoid=sles11_ppc64 + #kitcompdeps= + ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0 + exlist=pe.exlist + postinstall=pperte_postinstall + postupgrade=pperte_postinstall + postbootscripts=pperte_postboot -#kitcomponent: -# basename=pperte_loginnode -# description=PE RTE for login nodes -# version=1.2.0.10 -# release=s010a -# serverroles=loginnode -# kitrepoid=sles11_ppc64 -# #kitcompdeps= -# ospkgdeps=libibverbs(ppc-32),libibverbs(ppc-64) -# kitpkgdeps=ppe_rte_license,ppertesles11p >= 1.2.0.10,ppe_rte_man >= 1.2.0.10,ppe_rte_samples >= 1.2.0.10,src -# exlist=pe.exlist -# postinstall=pperte_postinstall -# postupgrade=pperte_postinstall -# postbootscripts=pperte_postboot +kitcomponent: + basename=min_pperte_compute + description=Minimal PE RTE for compute nodes + version=1.3.0.0 + release=1302a + serverroles=compute + kitrepoid=sles11_ppc64 + #kitcompdeps= + ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0 + exlist=pe.exlist + postinstall=pperte_postinstall + postupgrade=pperte_postinstall + postbootscripts=pperte_postboot + +kitcomponent: + basename=pperte_loginnode + description=PE RTE for login nodes + version=1.3.0.0 + release=1302a + serverroles=loginnode + kitrepoid=sles11_ppc64 + #kitcompdeps= + ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0 + exlist=pe.exlist + postinstall=pperte_postinstall + postupgrade=pperte_postinstall + postbootscripts=pperte_postboot # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. @@ -243,101 +244,59 @@ kitcomponent: ### RH6 ppc64 rpms kitpackage: - filename=pperterh6p-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=pperteman-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=ppertesamples-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=ppe_rte_rh6p_12010-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=ppe_rte_man-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=ppe_rte_samples-1.2.0.10-s010a.ppc64.rpm - kitrepoid=rhels6_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -### SLES11 ppc64 rpms -#kitpackage: -# filename=ppertesles11p-1.2.0.10-s010a.ppc64.rpm -# kitrepoid=sles11_ppc64 -# # Method 1: Use pre-built RPM package -# isexternalpkg=no -# rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=pperteman-1.2.0.10-s010a.ppc64.rpm - kitrepoid=sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=ppertesamples-1.2.0.10-s010a.ppc64.rpm - kitrepoid=sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - -#kitpackage: -# filename=ppe_rte_sles11p_12010-1.2.0.10-s010a.ppc64.rpm -# kitrepoid=sles11_ppc64 -# # Method 1: Use pre-built RPM package -# isexternalpkg=no -# rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=ppe_rte_man-1.2.0.10-s010a.ppc64.rpm - kitrepoid=sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=ppe_rte_samples-1.2.0.10-s010a.ppc64.rpm - kitrepoid=sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 -kitpackage: - filename=src-1.3.1.1-12080.ppc.rpm + filename=pperte-1.3.0.0-1302a.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 + rpm_prebuiltdir= + +kitpackage: + filename=pperteman-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=ppertesamples-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=ppe_rte_1300-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=ppe_rte_man-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=ppe_rte_samples-1.3.0.0-1302a.ppc64.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=src-*.ppc.rpm + kitrepoid=rhels6_ppc64,sles11_ppc64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= ### License rpm gets placed in all repos kitpackage: - filename=ppe_rte_license-1.2.0.10-s010a.ppc64.rpm + filename=ppe_rte_license-1.3.0.0-1302a.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 + rpm_prebuiltdir= diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/scripts/pperte_postinstall b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/scripts/pperte_postinstall index 541bd3ad1..cab6bafa7 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/scripts/pperte_postinstall +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/scripts/pperte_postinstall @@ -33,5 +33,27 @@ fi # POE requires rsh to be running /bin/sed -i 's/disable.*/disable = no/g' /etc/xinetd.d/rsh if [ -f "/proc/cmdline" ]; then + chkconfig xinetd on service xinetd restart fi + +#max locked memory +if ! grep "max locked memory" /etc/security/limits.conf >/dev/null 2>&1 ; then + sed -i "/# End of file/d" /etc/security/limits.conf + echo "#max locked memory" >> /etc/security/limits.conf + echo "* soft memlock unlimited" >> /etc/security/limits.conf + echo "* hard memlock unlimited" >> /etc/security/limits.conf + echo "# End of file" >> /etc/security/limits.conf +fi + +#max nofile configuration +if ! grep "max nofile" /etc/security/limits.conf >/dev/null 2>&1 ; then + sed -i "/# End of file/d" /etc/security/limits.conf + echo "#max nofile" >> /etc/security/limits.conf + echo "* soft nofile 4096" >> /etc/security/limits.conf + echo "* hard nofile 4096" >> /etc/security/limits.conf + echo "# End of file" >> /etc/security/limits.conf +fi + + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/buildkit.conf index 601de986e..6902e2e6c 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/buildkit.conf @@ -23,7 +23,7 @@ kit: basename=pperte description=Parallel Environment Runtime Edition - version=1.2.0.10 + version=1.3.0.0 ostype=Linux kitdeployparams=pe.env @@ -107,28 +107,28 @@ kitrepo: kitcomponent: basename=pperte_compute description=PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,pperterh6x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall - postbootscripts=pperte_postboot,pperte_postinstall + postbootscripts=pperte_postboot kitcomponent: basename=min_pperte_compute description=Minimal PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,pperterh6x >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -137,28 +137,29 @@ kitcomponent: kitcomponent: basename=pperte_loginnode description=PE RTE for login nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=loginnode kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,pperterh6x >= 1.2.0.10,ppe_rte_man >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall postbootscripts=pperte_postboot + kitcomponent: basename=pperte_compute description=PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,ppertesles11x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -167,13 +168,13 @@ kitcomponent: kitcomponent: basename=min_pperte_compute description=Minimal PE RTE for compute nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,ppertesles11x >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -182,13 +183,13 @@ kitcomponent: kitcomponent: basename=pperte_loginnode description=PE RTE for login nodes - version=1.2.0.10 - release=s010a + version=1.3.0.0 + release=1302a serverroles=loginnode kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,ppertesles11x >= 1.2.0.10,pperteman >= 1.2.0.10,ppertesamples >= 1.2.0.10,src + ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,pperteman >= 1.3.0.0,ppertesamples >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -243,101 +244,59 @@ kitcomponent: ### RH6 x86_64 rpms kitpackage: - filename=pperterh6x-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=pperteman-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=ppertesamples-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=ppe_rte_rh6x_12010-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=ppe_rte_man-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -kitpackage: - filename=ppe_rte_samples-1.2.0.10-s010a.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 - -### SLES11 x86_64 rpms -kitpackage: - filename=ppertesles11x-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=pperteman-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=ppertesamples-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=ppe_rte_sles11x_12010-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=ppe_rte_man-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=ppe_rte_samples-1.2.0.10-s010a.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - -kitpackage: - filename=src-1.3.1.1-12080.i386.rpm + filename=pperte-1.3.0.0-1302a.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 + rpm_prebuiltdir= + +kitpackage: + filename=pperteman-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=ppertesamples-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=ppe_rte_1300-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=ppe_rte_man-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=ppe_rte_samples-1.3.0.0-1302a.x86_64.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + +kitpackage: + filename=src-*.i386.rpm + kitrepoid=rhels6_x86_64,sles11_x86_64 + # Method 1: Use pre-built RPM package + isexternalpkg=no + rpm_prebuiltdir= + ### License rpm gets placed in all repos kitpackage: - filename=ppe_rte_license-1.2.0.0-1208e.x86_64.rpm + filename=ppe_rte_license-1.3.0.0-1302a.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 + rpm_prebuiltdir= diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/scripts/pperte_postinstall b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/scripts/pperte_postinstall index 541bd3ad1..cab6bafa7 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/scripts/pperte_postinstall +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/scripts/pperte_postinstall @@ -33,5 +33,27 @@ fi # POE requires rsh to be running /bin/sed -i 's/disable.*/disable = no/g' /etc/xinetd.d/rsh if [ -f "/proc/cmdline" ]; then + chkconfig xinetd on service xinetd restart fi + +#max locked memory +if ! grep "max locked memory" /etc/security/limits.conf >/dev/null 2>&1 ; then + sed -i "/# End of file/d" /etc/security/limits.conf + echo "#max locked memory" >> /etc/security/limits.conf + echo "* soft memlock unlimited" >> /etc/security/limits.conf + echo "* hard memlock unlimited" >> /etc/security/limits.conf + echo "# End of file" >> /etc/security/limits.conf +fi + +#max nofile configuration +if ! grep "max nofile" /etc/security/limits.conf >/dev/null 2>&1 ; then + sed -i "/# End of file/d" /etc/security/limits.conf + echo "#max nofile" >> /etc/security/limits.conf + echo "* soft nofile 4096" >> /etc/security/limits.conf + echo "* hard nofile 4096" >> /etc/security/limits.conf + echo "# End of file" >> /etc/security/limits.conf +fi + + +