diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/buildkit.conf deleted file mode 100644 index 237244bc1..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/buildkit.conf +++ /dev/null @@ -1,300 +0,0 @@ -# Kit Build File -# -# This file was initially auto-generated by the buildkit CLI command. -# To create a new kit, the user should modify this file accordingly. -# Refer to the buildkit manpage for further details. -# - -# kit: This section defines general info for the Kit. -# There must be exactly one kit section in a kit build file. -# -# kit attributes: -# basename (mandatory) Kit base name. e.g., kit-lsf -# description (optional) Kit description. -# version (mandatory) Kit version. e.g., 1.0 -# ostype (mandatory) Kit OS type. Must be Linux. -# AIX is currently not supported. -# isinternal (optional) PCM use only. -# Indicate if Kit is for internal use. -# Use 1 for yes, 0 for no. Default: 0 -# kitdeployparams (optional) Filename containing a list of kit deployment -# parameters, relative to -# /other_files -kit: - basename=vacpp - description=VACPP12 for Linux - version=12.1.0.0 - ostype=Linux -# kitdeployparams=sample/kitdeployparams.lst - - -# kitrepo: This section defines a Kit Package Repository. -# There must be at least one kitrepo section in a kit build file. -# If you want to support multiple OSes, you should create a separate -# repo for each OS. Also, no two repos can be defined with the same -# OS name, major/minor version and arch. For example, you cannot have -# two repos for RHEL 6.2 ppc64 in the same kit. -# -# kitrepo attributes: -# kitrepoid (mandatory) Kit package repository ID. -# Must be unique within this file. -# osbasename (mandatory) OS distro base name. e.g., rhels. -# osmajorversion (mandatory) OS major version. e.g., 6 -# osminorversion (optional) OS minor version. -# osarch (mandatory) OS architecture. e.g., ppc64 -# compat_osbasenames (optional) Comma-separated list of compatible -# OS distro base names. e.g., centos - -kitrepo: - kitrepoid=rhels6_ppc64 - osbasename=rhels - osmajorversion=6 - osarch=ppc64 - -kitrepo: - kitrepoid=sles11_ppc64 - osbasename=sles - 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, -# you should create one kitcomponent section for each OS. -# Also, no two components in a kit can be defined with the same -# base name. -# You can define multiple kit components with the same base name -# only if each kit component using this base name meets these -# requirements: -# - Each kit component must be defined with the same version -# and release number -# - Each kit component must be defined with a unique kitrepoid - -# -# kitcomponent attributes: -# basename (mandatory) Kit component base name -# description (optional) Kit component description -# version (mandatory) Kit component version -# release (mandatory) Kit component release -# serverroles (mandatory) Comma-separated list of servers that this -# component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility -# kitrepoid (mandatory) The ID of the kit package repository this -# component belongs to -# kitcompdeps (optional) Comma-separated list of kit component -# dependencies. These kit components can be included in -# this kit or in other kits. -# ospkgdpes=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64) (optional) Comma-separated list of OS package dependencies -# These packages must be shipped with the OS distro. -# kitpkgdeps (optional) Comma-separated list of kit package names that -# will be listed as "REQUIRES" when building this kit -# component. Each package must be defined in a separate -# 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 -# paths that will be included as files in this kit -# component. All filenames are relative to -# /source_packages -# Kit component deployment scripts must be specified -# to manage these files. -# driverpacks (optional) Comma-separated list of driver package filenames -# Each driverpack must be defined in a separate kitpackage -# section. -# exlist (optional) Exclude list file for stateless image, relative -# to /other_files -# Kit component deployment scripts (optional) Each attribute specifies -# script path relative to /scripts -# Script attributes: -# preinstall, postinstall, preuninstall, postuninstall, -# preupgrade, postupgrade, postbootscripts -kitcomponent: - basename=vacpp_compute - description=VACPP12 for compute nodes - version=12.1.0.0 - release=120323 - serverroles=compute - kitrepoid=rhels6_ppc64 - ospkgdpes=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64)libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=vac.cmp >= 12.1.0.0,vac.lib >= 12.1.0.0,vac.lic >= 12.1.0.0,vacpp.cmp >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.lib >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license - -kitcomponent: - basename=vacpp_login - description=VACPP12 for login nodes - version=12.1.0.0 - release=120323 - serverroles=login - kitrepoid=rhels6_ppc64 - ospkgdpes=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64)libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=vac.cmp >= 12.1.0.0,vac.lib >= 12.1.0.0,vac.lic >= 12.1.0.0,vacpp.cmp >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.lib >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license - -kitcomponent: - basename=min_vacpp_compute - description=Minimal VACPP12 packages for compute nodes - version=12.1.0.0 - release=120323 - serverroles=compute - kitrepoid=rhels6_ppc64 - ospkgdpes=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64)libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license - -kitcomponent: - basename=vacpp_compute - description=VACPP12 for compute nodes - version=12.1.0.0 - release=120323 - serverroles=compute - kitrepoid=sles11_ppc64 - ospkgdpes=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64)libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=vac.cmp >= 12.1.0.0,vac.lib >= 12.1.0.0,vac.lic >= 12.1.0.0,vacpp.cmp >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.lib >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license - -kitcomponent: - basename=vacpp_login - description=VACPP12 for login nodes - version=12.1.0.0 - release=120323 - serverroles=login - kitrepoid=sles11_ppc64 - ospkgdpes=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64)libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=vac.cmp >= 12.1.0.0,vac.lib >= 12.1.0.0,vac.lic >= 12.1.0.0,vacpp.cmp >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.lib >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license - -kitcomponent: - basename=min_vacpp_compute - description=Minimal VACPP12 packages for compute nodes - version=12.1.0.0 - release=120323 - serverroles=compute - kitrepoid=sles11_ppc64 - ospkgdpes=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64)libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license - - - -# kitpackage: This section defines one Kit Package, and how to build it. -# There can be zero or more kitpackage sections. -# All filenames should be relative paths to -# /source_packages -# If you want to build a package which can run on multiple OSes, -# you have two options: -# 1. Build a separate package for each OS you want to support. -# For this option, you need to define one kitpackage section -# per supported OS. -# 2. Build one package that can run on multiple OSes. -# If you are building an RPM package, you are responsible for -# creating an RPM spec file that can run on multiple OSes. -# For this option, you need to define one kitpackage section -# which contains multiple kitrepoid lines. -# -# kitpackage attributes: -# filename (mandatory) Package filename -# kitrepoid (mandatory) The repo(s) this package belongs to. -# If multiple repos are defined, the package will be built for -# the first repo only. For the other repos, a symlink is created -# to the package built for the first repo. -# Package build methods (optional) -# Define how to build the packages. -# If you don't specify a build method, the default behavior is -# to assume the package is pre-built under -# /source_packages -# All files in this section are relative to -# /source_packages -# There are four methods to build packages. -# 1. Use pre-built RPM package -# isexternalpkg: 'no'|'0', 'yes'|'1' (default: 'no') -# Indicates whether the RPM package will be added to the -# the kit tar file now as part of the kit build process, -# 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=yes, path to directory -# containing pre-built RPM package -# 2. Build RPM from spec + src dir -# rpm_spec: Path to spec file. -# rpm_srcdir: Path to source directory. -# 3. Build RPM from spec + src tarball -# rpm_spec: Path to spec file. -# rpm_srctarball: Path to source tarball. -# 4. Build RPM from source RPM -# rpm_srpm: Path to source RPM package. -kitpackage: - filename=vac.cmp-12.1.0.0-120323.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=vac.lib-12.1.0.0-120323.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=vac.lic-12.1.0.0-120323.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=vacpp.cmp-12.1.0.0-120323.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=vacpp.help.pdf-12.1.0.0-120323.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=vacpp.lib-12.1.0.0-120323.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=vacpp.man-12.1.0.0-120323.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=vacpp.rte-12.1.0.0-120323.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=vacpp.rte.lnk-12.1.0.0-120323.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=vacpp.samples-12.1.0.0-120323.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/compiler/partial_vacpp12-Linux/scripts/vacpp_license b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/scripts/vacpp_license deleted file mode 100755 index fe59c8ba4..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/scripts/vacpp_license +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# -# Sample script to accept licenses for the IBM vacpp and xlf compilers -# For AIX: -# do nothing, license accepted with installp -Y flag -# For Linux: -# Assumes all compiler software has been installed - - -OS=`uname` -if [ $OS != "AIX" ]; then - vacpp_script=`find /opt/ibmcmp/vacpp -name new_install -print` - - if [ -n "$vacpp_script" ] ; then - echo 1 | $vacpp_script - fi - -fi - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/buildkit.conf similarity index 78% rename from xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/buildkit.conf index 416b79b50..79d54db54 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/buildkit.conf @@ -21,10 +21,11 @@ # parameters, relative to # /other_files kit: - basename=vacpp - description=VACPP12 for Linux + basename=xlc + description=XLC12 for Linux version=12.1.0.0 ostype=Linux + kitlicense=IPLA # kitdeployparams=sample/kitdeployparams.lst @@ -79,7 +80,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility +# mgtnode,servicenode,compute,loginnode,storagenode # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -110,76 +111,82 @@ kitrepo: # preinstall, postinstall, preuninstall, postuninstall, # preupgrade, postupgrade, postbootscripts kitcomponent: - basename=vacpp_compute - description=VACPP12 for compute nodes + basename=xlc_compute + description=XLC12 for compute nodes version=12.1.0.0 release=120323 serverroles=compute kitrepoid=rhels6_ppc64 ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64) - kitpkgdeps=vac.cmp >= 12.1.0.0,vac.lib >= 12.1.0.0,vac.lic >= 12.1.0.0,vacpp.cmp >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.lib >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license + kitpkgdeps=vac.lic >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 + exlist=xlc.exlist + genimage_postinstall=xlc_license,rhels_xlc_compute_install + non_native_pkgs=EXTERNALPKGS:vac.lib-12.1.0.0*,EXTERNALPKGS:vac.cmp-12.1.0.0*,EXTERNALPKGS:vacpp.lib-12.1.0.0*,EXTERNALPKGS:vacpp.cmp-12.1.0.0* kitcomponent: - basename=vacpp_login - description=VACPP12 for login nodes + basename=xlc_loginnode + description=XLC12 for login nodes version=12.1.0.0 release=120323 - serverroles=login + serverroles=loginnode kitrepoid=rhels6_ppc64 ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64) - kitpkgdeps=vac.cmp >= 12.1.0.0,vac.lib >= 12.1.0.0,vac.lic >= 12.1.0.0,vacpp.cmp >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.lib >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license + kitpkgdeps=vac.lic >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 + exlist=xlc.exlist + genimage_postinstall=xlc_license,rhels_xlc_login_install + non_native_pkgs=EXTERNALPKGS:vac.lib-12.1.0.0*,EXTERNALPKGS:vac.cmp-12.1.0.0*,EXTERNALPKGS:vacpp.lib-12.1.0.0*,EXTERNALPKGS:vacpp.cmp-12.1.0.0* kitcomponent: - basename=min_vacpp_compute - description=Minimal VACPP12 packages for compute nodes + basename=min_xlc_compute + description=Minimal XLC12 packages for compute nodes version=12.1.0.0 release=120323 serverroles=compute kitrepoid=rhels6_ppc64 ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64) kitpkgdeps=vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license + exlist=xlc.exlist + genimage_postinstall=xlc_license,rhels_min_xlc_compute_install + non_native_pkgs=EXTERNALPKGS:vac.lib-12.1.0.0*,EXTERNALPKGS:vac.cmp-12.1.0.0*,EXTERNALPKGS:vacpp.lib-12.1.0.0*,EXTERNALPKGS:vacpp.cmp-12.1.0.0* kitcomponent: - basename=vacpp_compute - description=VACPP12 for compute nodes + basename=xlc_compute + description=XLC12 for compute nodes version=12.1.0.0 release=120323 serverroles=compute kitrepoid=sles11_ppc64 ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64) - kitpkgdeps=vac.cmp >= 12.1.0.0,vac.lib >= 12.1.0.0,vac.lic >= 12.1.0.0,vacpp.cmp >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.lib >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license + kitpkgdeps=vac.lic >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 + exlist=xlc.exlist + genimage_postinstall=xlc_license,sles_xlc_compute_install + non_native_pkgs=EXTERNALPKGS:vac.lib-12.1.0.0*,EXTERNALPKGS:vac.cmp-12.1.0.0*,EXTERNALPKGS:vacpp.lib-12.1.0.0*,EXTERNALPKGS:vacpp.cmp-12.1.0.0* kitcomponent: - basename=vacpp_login - description=VACPP12 for login nodes + basename=xlc_loginnode + description=XLC12 for login nodes version=12.1.0.0 release=120323 - serverroles=login + serverroles=loginnode kitrepoid=sles11_ppc64 ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64) - kitpkgdeps=vac.cmp >= 12.1.0.0,vac.lib >= 12.1.0.0,vac.lic >= 12.1.0.0,vacpp.cmp >= 12.1.0.0,vacpp.help.pdf >= 12.1.0.0,vacpp.lib >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license + kitpkgdeps=vacpp.help.pdf >= 12.1.0.0,vacpp.lib >= 12.1.0.0,vacpp.man >= 12.1.0.0,vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0,vacpp.samples >= 12.1.0.0 + exlist=xlc.exlist + genimage_postinstall=xlc_license,sles_xlc_login_install + non_native_pkgs=EXTERNALPKGS:vac.lib-12.1.0.0*,EXTERNALPKGS:vac.cmp-12.1.0.0*,EXTERNALPKGS:vacpp.lib-12.1.0.0*,EXTERNALPKGS:vacpp.cmp-12.1.0.0* kitcomponent: - basename=min_vacpp_compute - description=Minimal VACPP12 packages for compute nodes + basename=min_xlc_compute + description=Minimal XLC12 packages for compute nodes version=12.1.0.0 release=120323 serverroles=compute kitrepoid=sles11_ppc64 ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64) kitpkgdeps=vacpp.rte >= 12.1.0.0,vacpp.rte.lnk >= 12.1.0.0 - exlist=vacpp.exlist - postbootscripts=vacpp_license + exlist=xlc.exlist + genimage_postinstall=xlc_license,sles_min_xlc_compute_install + non_native_pkgs=EXTERNALPKGS:vac.lib-12.1.0.0*,EXTERNALPKGS:vac.cmp-12.1.0.0*,EXTERNALPKGS:vacpp.lib-12.1.0.0*,EXTERNALPKGS:vacpp.cmp-12.1.0.0* # kitpackage: This section defines one Kit Package, and how to build it. @@ -218,7 +225,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. @@ -232,68 +239,68 @@ kitpackage: filename=vac.cmp-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + kitpackage: filename=vac.lib-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + kitpackage: filename=vac.lic-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + kitpackage: filename=vacpp.cmp-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + kitpackage: filename=vacpp.help.pdf-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + kitpackage: filename=vacpp.lib-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + kitpackage: filename=vacpp.man-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + kitpackage: filename=vacpp.rte-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + kitpackage: filename=vacpp.rte.lnk-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + kitpackage: filename=vacpp.samples-12.1.0.0-120323.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + isexternalpkg=yes + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/other_files/vacpp.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/other_files/xlc.exlist similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/other_files/vacpp.exlist rename to xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/other_files/xlc.exlist diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/plugins/sample/imageprofile.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/plugins/sample/imageprofile.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/plugins/sample/imageprofile.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/plugins/sample/nodemgmt.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_vacpp12-Linux/plugins/sample/nodemgmt.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/plugins/sample/nodemgmt.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/rhels_min_xlc_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/rhels_min_xlc_compute_install new file mode 100755 index 000000000..c94da9070 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/rhels_min_xlc_compute_install @@ -0,0 +1,15 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlc/xlc_min_compute-12.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlc/xlc_min_compute-12.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlc/xlc_min_compute-12.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlc/xlc_min_compute-12.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 +~ diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/rhels_xlc_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/rhels_xlc_compute_install new file mode 100755 index 000000000..8119574be --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/rhels_xlc_compute_install @@ -0,0 +1,15 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlc/xlc_compute-12.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlc/xlc_compute-12.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlc/xlc_compute-12.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlc/xlc_compute-12.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 +~ diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/rhels_xlc_login_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/rhels_xlc_login_install new file mode 100755 index 000000000..697b5b73f --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/rhels_xlc_login_install @@ -0,0 +1,15 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlc/xlc_login-12.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlc/xlc_login-12.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlc/xlc_login-12.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlc/xlc_login-12.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 +~ diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/sles_min_xlc_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/sles_min_xlc_compute_install new file mode 100755 index 000000000..7b9afb99d --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/sles_min_xlc_compute_install @@ -0,0 +1,15 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlc/xlc_min_compute-12.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlc/xlc_min_compute-12.1.0.0-120323-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlc/xlc_min_compute-12.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlc/xlc_min_compute-12.1.0.0-120323-sles-11-ppc64/*.rpm + fi +fi + +exit 0 +~ diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/sles_xlc_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/sles_xlc_compute_install new file mode 100755 index 000000000..0d439e213 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/sles_xlc_compute_install @@ -0,0 +1,15 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlc/xlc_compute-12.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlc/xlc_compute-12.1.0.0-120323-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlc/xlc_compute-12.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlc/xlc_compute-12.1.0.0-120323-sles-11-ppc64/*.rpm + fi +fi + +exit 0 +~ diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/sles_xlc_login_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/sles_xlc_login_install new file mode 100755 index 000000000..0e2de01ec --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/sles_xlc_login_install @@ -0,0 +1,15 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlc/xlc_login-12.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlc/xlc_login-12.1.0.0-120323-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlc/xlc_login-12.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlc/xlc_login-12.1.0.0-120323-sles-11-ppc64/*.rpm + fi +fi + +exit 0 +~ diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/xlc_license b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/xlc_license new file mode 100755 index 000000000..a67701d78 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlc12-Linux/scripts/xlc_license @@ -0,0 +1,26 @@ +#!/bin/sh + +# +# Sample script to accept licenses for the IBM vacpp compilers +# For Linux: +# Assumes all compiler software has been installed + +OS=`uname` +if [ $OS != "AIX" ]; then + cd $installroot/ + vacpp_script=`find opt/ibmcmp/vacpp -name new_install -print` + + if [ -n $installroot ]; then + # Being run from a stateful install postscript or stateless postbootscript. + if [ -n "$vacpp_script" ] ; then + echo 1 | chroot $installroot /$vacpp_script + fi + else + # Being run from a stateful install postscript postbootscript. + if [ -n "$vacpp_script" ] ; then + echo 1 | $vacpp_script + fi + fi +fi + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/buildkit.conf index be1e36f61..d172c14b2 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/buildkit.conf @@ -25,6 +25,7 @@ kit: description=XLF14 for Linux version=14.1.0.0 ostype=Linux + kitlicense=IPLA # kitdeployparams=sample/kitdeployparams.lst @@ -79,7 +80,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility +# mgtnode,service,compute,login,storage # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -116,10 +117,11 @@ kitcomponent: release=120323 serverroles=compute kitrepoid=rhels6_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.lib >= 14.1.0.0,xlf.cmp >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) + kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,rhels_xlf_compute_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: basename=xlf_login @@ -128,10 +130,11 @@ kitcomponent: release=120323 serverroles=login kitrepoid=rhels6_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.lib >= 14.1.0.0,xlf.cmp >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) + kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,rhels_xlf_login_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: basename=min_xlf_compute @@ -140,10 +143,11 @@ kitcomponent: release=120323 serverroles=compute kitrepoid=rhels6_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) kitpkgdeps=xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.00 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,rhels_min_xlf_compute_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: @@ -153,10 +157,11 @@ kitcomponent: release=120323 serverroles=compute kitrepoid=sles11_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.lib >= 14.1.0.0,xlf.cmp >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) + kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,sles_xlf_compute_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: basename=xlf_login @@ -165,10 +170,11 @@ kitcomponent: release=120323 serverroles=login kitrepoid=sles11_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.lib >= 14.1.0.0,xlf.cmp >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) + kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,sles_xlf_login_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: basename=min_xlf_compute @@ -177,11 +183,11 @@ kitcomponent: release=120323 serverroles=compute kitrepoid=sles11_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) kitpkgdeps=xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.00 exlist=xlf.exlist - postbootscripts=xlf_license - + genimage_postinstall=xlf_license,sles_min_xlf_compute_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/rhels_min_xlf_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/rhels_min_xlf_compute_install new file mode 100755 index 000000000..630270738 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/rhels_min_xlf_compute_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/rhels_xlf_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/rhels_xlf_compute_install new file mode 100755 index 000000000..21bc6f712 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/rhels_xlf_compute_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/rhels_xlf_login_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/rhels_xlf_login_install new file mode 100755 index 000000000..1a982d5f8 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/rhels_xlf_login_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/sles_min_xlf_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/sles_min_xlf_compute_install new file mode 100755 index 000000000..b599a190e --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/sles_min_xlf_compute_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/sles_xlf_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/sles_xlf_compute_install new file mode 100755 index 000000000..eafaad3f8 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/sles_xlf_compute_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/sles_xlf_login_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/sles_xlf_login_install new file mode 100755 index 000000000..91be832ec --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/sles_xlf_login_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/xlf_license b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/xlf_license index 9711ed972..d0799ea9c 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/xlf_license +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/partial_xlf14-Linux/scripts/xlf_license @@ -1,19 +1,26 @@ #!/bin/sh # -# Sample script to accept licenses for the IBM vacpp and xlf compilers +# Sample script to accept licenses for the IBM xlf compilers # For Linux: # Assumes all compiler software has been installed OS=`uname` if [ $OS != "AIX" ]; then - xlf_script=`find /opt/ibmcmp/xlf -name new_install -print` + cd $installroot/ + xlf_script=`find opt/ibmcmp/xlf -name new_install -print` - # Being run from a stateful install postscript or stateless postbootscript. - if [ -n "$xlf_script" ] ; then - echo 1 | $xlf_script + if [ -n $installroot ]; then + # Being run from a stateful install postscript or stateless postbootscript. + if [ -n "$xlf_script" ] ; then + echo 1 | chroot $installroot /$xlf_script + fi + else + # Being run from a stateful install postscript postbootscript. + if [ -n "$xlf_script" ] ; then + echo 1 | $xlf_script + fi fi - fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/other_files/vacpp.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/other_files/vacpp.exlist deleted file mode 100755 index 18b4e5c98..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/other_files/vacpp.exlist +++ /dev/null @@ -1,14 +0,0 @@ -./opt/ibmcmp/msg/* -+./opt/ibmcmp/msg/en_US* - -./opt/ibmcmp/vac/*/crt/include* -./opt/ibmcmp/vac/*/include* -./opt/ibmcmp/vac/*/msg/* -+./opt/ibmcmp/vac/*/msg/en_US* -./opt/ibmcmp/vac/*/lap/LI_* -./opt/ibmcmp/vac/*/lap/LA_* -./opt/ibmcmp/vac/*/lap/license/*.txt - -./opt/ibmcmp/vacpp/*/include* -./opt/ibmcmp/vacpp/*/msg/* -+./opt/ibmcmp/vacpp/*/msg/en_US* diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/scripts/vacpp_license b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/scripts/vacpp_license deleted file mode 100755 index fe59c8ba4..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/scripts/vacpp_license +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -# -# Sample script to accept licenses for the IBM vacpp and xlf compilers -# For AIX: -# do nothing, license accepted with installp -Y flag -# For Linux: -# Assumes all compiler software has been installed - - -OS=`uname` -if [ $OS != "AIX" ]; then - vacpp_script=`find /opt/ibmcmp/vacpp -name new_install -print` - - if [ -n "$vacpp_script" ] ; then - echo 1 | $vacpp_script - fi - -fi - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/buildkit.conf index 61883f2ce..d459fe372 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/buildkit.conf @@ -25,6 +25,7 @@ kit: description=XLF14 for Linux version=14.1.0.0 ostype=Linux + kitlicense=IPLA # kitdeployparams=sample/kitdeployparams.lst @@ -79,7 +80,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility +# mgtnode,service,compute,login,storage # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -116,10 +117,11 @@ kitcomponent: release=120323 serverroles=compute kitrepoid=rhels6_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.lib >= 14.1.0.0,xlf.cmp >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) + kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,rhels_xlf_compute_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: basename=xlf_login @@ -128,10 +130,11 @@ kitcomponent: release=120323 serverroles=login kitrepoid=rhels6_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.lib >= 14.1.0.0,xlf.cmp >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) + kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,rhels_xlf_login_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: basename=min_xlf_compute @@ -140,10 +143,11 @@ kitcomponent: release=120323 serverroles=compute kitrepoid=rhels6_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) kitpkgdeps=xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.00 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,rhels_min_xlf_compute_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: @@ -153,10 +157,11 @@ kitcomponent: release=120323 serverroles=compute kitrepoid=sles11_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.lib >= 14.1.0.0,xlf.cmp >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) + kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,sles_xlf_compute_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: basename=xlf_login @@ -165,10 +170,11 @@ kitcomponent: release=120323 serverroles=login kitrepoid=sles11_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 - kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.lib >= 14.1.0.0,xlf.cmp >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) + kitpkgdeps=xlmass.lib >= 7.1.0.0,xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlsmp.lib >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.0,xlf.help.pdf >= 14.1.0.0,xlf.samples >= 14.1.0.0,xlf.man >= 14.1.0.0,xlf.lic >= 14.1.0.0 exlist=xlf.exlist - postbootscripts=xlf_license + genimage_postinstall=xlf_license,sles_xlf_login_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm kitcomponent: basename=min_xlf_compute @@ -177,11 +183,11 @@ kitcomponent: release=120323 serverroles=compute kitrepoid=sles11_ppc64 - ospkgdeps=libstdc++.ppc,libstdc++.ppc64,libstdc++-devel.ppc,libstdc++-devel.ppc64 + ospkgdeps=libstdc++(ppc-32),libstdc++(ppc-64),libstdc++-devel(ppc-32),libstdc++-devel(ppc-64),glibc-devel(ppc-32),glibc-devel(ppc-64),compat-libstdc++-33(ppc-32),compat-libstdc++-33(ppc-64) kitpkgdeps=xlsmp.msg.rte >= 3.1.0.0,xlsmp.rte >= 3.1.0.0,xlf.msg.rte >= 14.1.0.0,xlf.rte >= 14.1.0.0,xlf.rte.lnk >= 14.1.0.00 exlist=xlf.exlist - postbootscripts=xlf_license - + genimage_postinstall=xlf_license,sles_min_xlf_compute_install + non_native_pkgs=EXTERNALPKGS:xlf.lib-14.1.0.0-*.rpm,EXTERNALPKGS:xlf.cmp-14.1.0.0-*.rpm # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. @@ -235,6 +241,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlf.help.pdf-14.1.0.0-120323.ppc64.rpm @@ -242,6 +249,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlf.lib-14.1.0.0-120323.ppc64.rpm @@ -249,6 +257,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlf.lic-14.1.0.0-120323.ppc64.rpm @@ -256,6 +265,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlf.man-14.1.0.0-120323.ppc64.rpm @@ -263,6 +273,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlf.msg.rte-14.1.0.0-120323.ppc64.rpm @@ -270,6 +281,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlf.rte-14.1.0.0-120323.ppc64.rpm @@ -277,6 +289,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlf.rte.lnk-14.1.0.0-120323.ppc64.rpm @@ -284,6 +297,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlf.samples-14.1.0.0-120323.ppc64.rpm @@ -291,6 +305,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlmass.lib-7.1.0.0-120322.ppc64.rpm @@ -298,6 +313,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlsmp.lib-3.1.0.0-120315a.ppc64.rpm @@ -305,6 +321,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlsmp.msg.rte-3.1.0.0-120315a.ppc64.rpm @@ -312,6 +329,7 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + kitpackage: filename=xlsmp.rte-3.1.0.0-120315a.ppc64.rpm @@ -319,3 +337,4 @@ kitpackage: # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir= + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/rhels_min_xlf_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/rhels_min_xlf_compute_install new file mode 100755 index 000000000..630270738 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/rhels_min_xlf_compute_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/rhels_xlf_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/rhels_xlf_compute_install new file mode 100755 index 000000000..21bc6f712 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/rhels_xlf_compute_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/rhels_xlf_login_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/rhels_xlf_login_install new file mode 100755 index 000000000..1a982d5f8 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/rhels_xlf_login_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/sles_min_xlf_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/sles_min_xlf_compute_install new file mode 100755 index 000000000..b599a190e --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/sles_min_xlf_compute_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/min_xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/sles_xlf_compute_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/sles_xlf_compute_install new file mode 100755 index 000000000..eafaad3f8 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/sles_xlf_compute_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/xlf_compute-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/sles_xlf_login_install b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/sles_xlf_login_install new file mode 100755 index 000000000..91be832ec --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/sles_xlf_login_install @@ -0,0 +1,14 @@ + +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/xlf/xlf_login-14.1.0.0-120323-sles-11-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/xlf_license b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/xlf_license index 9711ed972..d0799ea9c 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/xlf_license +++ b/xCAT-buildkit/share/xcat/kits/kit_build/compiler/xlf14-Linux/scripts/xlf_license @@ -1,19 +1,26 @@ #!/bin/sh # -# Sample script to accept licenses for the IBM vacpp and xlf compilers +# Sample script to accept licenses for the IBM xlf compilers # For Linux: # Assumes all compiler software has been installed OS=`uname` if [ $OS != "AIX" ]; then - xlf_script=`find /opt/ibmcmp/xlf -name new_install -print` + cd $installroot/ + xlf_script=`find opt/ibmcmp/xlf -name new_install -print` - # Being run from a stateful install postscript or stateless postbootscript. - if [ -n "$xlf_script" ] ; then - echo 1 | $xlf_script + if [ -n $installroot ]; then + # Being run from a stateful install postscript or stateless postbootscript. + if [ -n "$xlf_script" ] ; then + echo 1 | chroot $installroot /$xlf_script + fi + else + # Being run from a stateful install postscript postbootscript. + if [ -n "$xlf_script" ] ; then + echo 1 | $xlf_script + fi fi - fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/essl/essl/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/essl/essl/buildkit.conf index 4c122ad61..41a64b96f 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/essl/essl/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/essl/essl/buildkit.conf @@ -25,6 +25,7 @@ kit: description=essl for Linux version=5.1.1 ostype=Linux + kitlicense=IPLA kitdeployparams=essl.env @@ -79,7 +80,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility +# mgtnode,servicenode,compute,loginnode,storagenode # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -116,18 +117,18 @@ kitcomponent: release=0 serverroles=compute kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.man >= 5.1.1,essl.msg >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist kitcomponent: - basename=essl_login + basename=essl_loginnode description=essl for login nodes version=5.1.1 release=0 - serverroles=login + serverroles=loginnode kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.man >= 5.1.1,essl.msg >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist @@ -138,7 +139,7 @@ kitcomponent: release=0 serverroles=compute kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist @@ -149,18 +150,18 @@ kitcomponent: release=0 serverroles=compute kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.man >= 5.1.1,essl.msg >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist kitcomponent: - basename=essl_login + basename=essl_loginnode description=essl for compute nodes version=5.1.1 release=0 - serverroles=login + serverroles=loginnode kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.man >= 5.1.1,essl.msg >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist @@ -171,7 +172,7 @@ kitcomponent: release=0 serverroles=compute kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/essl/partial_essl/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/essl/partial_essl/buildkit.conf index 2e421eabb..20e5c81f1 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/essl/partial_essl/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/essl/partial_essl/buildkit.conf @@ -25,6 +25,7 @@ kit: description=essl for Linux version=5.1.1 ostype=Linux + kitlicense=IPLA kitdeployparams=essl.env @@ -79,7 +80,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility +# mgtnode,servicenode,compute,loginnode,storagenode # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -116,18 +117,18 @@ kitcomponent: release=0 serverroles=compute kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.man >= 5.1.1,essl.msg >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist kitcomponent: - basename=essl_login + basename=essl_loginnode description=essl for login nodes version=5.1.1 release=0 - serverroles=login + serverroles=loginnode kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.man >= 5.1.1,essl.msg >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist @@ -138,7 +139,7 @@ kitcomponent: release=0 serverroles=compute kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist @@ -149,18 +150,18 @@ kitcomponent: release=0 serverroles=compute kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.man >= 5.1.1,essl.msg >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist kitcomponent: - basename=essl_login + basename=essl_loginnode description=essl for login nodes version=5.1.1 release=0 - serverroles=login + serverroles=loginnode kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.man >= 5.1.1,essl.msg >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist @@ -171,7 +172,7 @@ kitcomponent: release=0 serverroles=compute kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit + ospkgdeps=bc kitpkgdeps=essl.3232.rte >= 5.1.1,essl.3264.rte >= 5.1.1,essl.6464.rte >= 5.1.1,essl.bg.rte >= 5.1.1,essl.common >= 5.1.1,essl.license >= 5.1.1,essl.rte >= 5.1.1,essl.rte.common >= 5.1.1 exlist=essl.exlist diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/buildkit.conf similarity index 62% rename from xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/buildkit.conf index 4158ddc42..62833b751 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/buildkit.conf @@ -21,11 +21,12 @@ # parameters, relative to # /other_files kit: - basename=pessl - description=pessl for Linux - version=4.2.0 + basename=gpfs + description=General Parallel File System + version=3.5.0-7 ostype=Linux - kitdeployparams=pessl.env + kitlicense=IPLA + #kitdeployparams= # kitrepo: This section defines a Kit Package Repository. @@ -46,18 +47,19 @@ kit: # OS distro base names. e.g., centos kitrepo: - kitrepoid=rhels6_ppc64 + kitrepoid=rhels6-ppc64 osbasename=rhels osmajorversion=6 osarch=ppc64 + #compat_osbasenames= + kitrepo: - kitrepoid=sles11_ppc64 + kitrepoid=sles11-ppc64 osbasename=sles 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, @@ -93,7 +95,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 @@ -110,70 +112,130 @@ kitrepo: # preinstall, postinstall, preuninstall, postuninstall, # preupgrade, postupgrade, postbootscripts kitcomponent: - basename=pessl_compute - description=pessl for compute nodes - version=4.2.0 - release=0 - serverroles=compute - kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.man >= 4.2.0,pessl.msg >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=pessl.exlist + basename=gpfs_compute + description=GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode + kitrepoid=rhels6-ppc64 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=pessl_login - description=pessl for login nodes - version=4.2.0 - release=0 + basename=min_gpfs_compute + description=Minimal GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode + kitrepoid=rhels6-ppc64 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 + exlist=min-gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + +kitcomponent: + basename=gpfs_login + description=GPFS for login nodes + version=3.5.0 + release=7 serverroles=login - kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.man >= 4.2.0,pessl.msg >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=pessl.exlist + kitrepoid=rhels6-ppc64 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=min_pessl_compute - description=Minimal pessl for compute nodes - version=4.2.0 - release=0 - serverroles=compute - kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=min-pessl.exlist + basename=gpfs_storage + description=GPFS for storage nodes + version=3.5.0 + release=7 + serverroles=storage,servicenode + kitrepoid=rhels6-ppc64 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update_storage + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=essl_compute - description=pessl for compute nodes - version=4.2.0 - release=0 - serverroles=compute - kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.man >= 4.2.0,pessl.msg >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=pessl.exlist + basename=gpfs_compute + description=GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode + kitrepoid=sles11-ppc64 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 ,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=essl_login - description=pessl for login nodes - version=4.2.0 - release=0 + basename=min_gpfs_compute + description=Minimal GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode + kitrepoid=sles11-ppc64 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,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_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + +kitcomponent: + basename=gpfs_login + description=GPFS for login nodes + version=3.5.0 + release=7 serverroles=login - kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.man >= 4.2.0,pessl.msg >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=pessl.exlist + kitrepoid=sles11-ppc64 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=min_essl_compute - description=Minimal pessl for compute nodes - version=4.2.0 - release=0 - serverroles=compute - kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=min-pessl.exlist + basename=gpfs_storage + description=GPFS for storage nodes + version=3.5.0 + release=7 + serverroles=storage,servicenode + kitrepoid=sles11-ppc64 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update_storage + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + # kitpackage: This section defines one Kit Package, and how to build it. @@ -223,63 +285,43 @@ kitcomponent: # 4. Build RPM from source RPM # rpm_srpm: Path to source RPM package. kitpackage: - filename=pessl.3232.rte.mpich-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 + filename=gpfs.base-3.5.0-7.ppc64.rpm + kitrepoid=rhels6-ppc64,sles11-ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= -kitpackage: - filename=pessl.3232.rte.ppe-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=pessl.3264.rte.mpich-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 + filename=gpfs.gpl-3.5.0-7.noarch.rpm + kitrepoid=rhels6-ppc64,sles11-ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=pessl.3264.rte.ppe-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 + filename=gpfs.docs-3.5.0-7.noarch.rpm + kitrepoid=rhels6-ppc64,sles11-ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=pessl.common-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 + filename=gpfs.msg.en_US-3.5.0-7.noarch.rpm + kitrepoid=rhels6-ppc64,sles11-ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=pessl.license-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 + filename=gpfs.libsrc-3.5.0-7.noarch.rpm + kitrepoid=rhels6-ppc64,sles11-ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=pessl.man-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 + filename=gpfs.src-3.5.0-7.noarch.rpm + kitrepoid=rhels6-ppc64,sles11-ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= - -kitpackage: - filename=pessl.msg-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= - -kitpackage: - filename=pessl.rte.common-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/gpfs.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/gpfs.exlist new file mode 100755 index 000000000..e019951c7 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/gpfs.exlist @@ -0,0 +1,3 @@ +./usr/lpp/mmfs/include* +./usr/lpp/mmfs/samples* + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/min-gpfs.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/min-gpfs.exlist new file mode 100755 index 000000000..ccb5ebe96 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/min-gpfs.exlist @@ -0,0 +1,5 @@ +# Exclude list for building a minimal diskless image + +./usr/lpp/mmfs/include* +./usr/lpp/mmfs/samples* +./usr/lpp/mmfs/src* diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/sample/exclude.lst b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/sample/exclude.lst new file mode 100644 index 000000000..e69de29bb diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/sample/kitdeployparams.lst b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/other_files/sample/kitdeployparams.lst new file mode 100644 index 000000000..e69de29bb diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/plugins/sample/imageprofile.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/plugins/sample/imageprofile.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/plugins/sample/imageprofile.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/plugins/sample/nodemgmt.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/compiler/vacpp12-Linux/plugins/sample/nodemgmt.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/plugins/sample/nodemgmt.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_config b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_config new file mode 100755 index 000000000..9850b01b6 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-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/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_config_storage b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/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-7-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/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_mmsdrfs b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_mmsdrfs new file mode 100755 index 000000000..95b3d05b1 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_mmsdrfs @@ -0,0 +1,30 @@ +#!/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 + echo "Restoring GPFS configration file from server." + /usr/lpp/mmfs/bin/mmsdrrestore -p $GPFSMGR -R /usr/bin/scp & +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_start b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_start new file mode 100755 index 000000000..18bd1d1ee --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/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-7-Linux-ppc64/scripts/gpfs_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_update new file mode 100755 index 000000000..1e705acb8 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_update_storage b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_update_storage new file mode 100755 index 000000000..dd5ceec90 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_update_storage @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/buildkit.conf similarity index 64% rename from xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-x86_64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/buildkit.conf index 60253e17b..93e7ca81a 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/buildkit.conf @@ -21,11 +21,12 @@ # parameters, relative to # /other_files kit: - basename=teal - description=teal for Linux - version=1.2.0.2 + basename=gpfs + description=General Parallel File System + version=3.5.0-7 ostype=Linux -# kitdeployparams= + kitlicense=IPLA + #kitdeployparams= # kitrepo: This section defines a Kit Package Repository. @@ -51,13 +52,14 @@ kitrepo: osmajorversion=6 osarch=x86_64 + #compat_osbasenames= + kitrepo: kitrepoid=sles11_x86_64 osbasename=sles 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, @@ -79,7 +81,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,mgtnode,login,storage,utility +# mgtnode,servicenode,compute,login,storage,utility # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -93,7 +95,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 @@ -110,112 +112,134 @@ kitrepo: # preinstall, postinstall, preuninstall, postuninstall, # preupgrade, postupgrade, postbootscripts kitcomponent: - basename=teal-base - description=teal for management nodes - version=1.2.0.2 - release=1 - serverroles=mgtnode + basename=gpfs_compute + description=GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-base >= 1.2.0.2 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-isnm - description=teal for isnm - version=1.2.0.1 - release=1 - serverroles=mgtnode + basename=min_gpfs_compute + description=Minimal GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-isnm >= 1.2.0.1 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,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_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-ll - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode + basename=gpfs_login + description=GPFS for login nodes + version=3.5.0 + release=7 + serverroles=login kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-isnm >= 1.2.0.0 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-pnsd - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode + basename=gpfs_storage + description=GPFS for storage nodes + version=3.5.0 + release=7 + serverroles=storage,servicenode kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-pnsd >= 1.2.0.0 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update_storage + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-sfp - description=teal for sfp - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-sfp >= 1.2.0.0 - -kitcomponent: - basename=teal-test - description=teal test - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-test >= 1.2.0.2 - -kitcomponent: - basename=teal-base - description=teal for management nodes - version=1.2.0.2 - release=1 - serverroles=mgtnode + basename=gpfs_compute + description=GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=sles11_x86_64 - kitpkgdeps=teal-base >= 1.2.0.2 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 ,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-isnm - description=teal for isnm - version=1.2.0.1 - release=1 - serverroles=mgtnode + basename=min_gpfs_compute + description=Minimal GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=sles11_x86_64 - kitpkgdeps=teal-isnm >= 1.2.0.1 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,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_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-ll - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode + basename=gpfs_login + description=GPFS for login nodes + version=3.5.0 + release=7 + serverroles=login kitrepoid=sles11_x86_64 - kitpkgdeps=teal-isnm >= 1.2.0.0 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-pnsd - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=sles11_x86_64 - kitpkgdeps=teal-pnsd >= 1.2.0.0 - -kitcomponent: - basename=teal-sfp - description=teal for sfp - version=1.2.0.0 - release=1 - serverroles=mgtnode + basename=gpfs_storage + description=GPFS for storage nodes + version=3.5.0 + release=7 + serverroles=storage,servicenode kitrepoid=sles11_x86_64 - kitpkgdeps=teal-sfp >= 1.2.0.0 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=gpfs_update_storage + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + -kitcomponent: - basename=teal-test - description=teal test - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=sles11_x86_64 - kitpkgdeps=teal-test >= 1.2.0.2 # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. @@ -264,43 +288,43 @@ kitcomponent: # 4. Build RPM from source RPM # rpm_srpm: Path to source RPM package. kitpackage: - filename=teal-base-1.2.0.2-1.x86_64.rpm + filename=gpfs.base-3.5.0-7.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=teal-isnm-1.2.0.1-1.x86_64.rpm + filename=gpfs.gpl-3.5.0-7.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=teal-ll-1.2.0.0-1.x86_64.rpm + filename=gpfs.docs-3.5.0-7.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=teal-pnsd-1.2.0.0-1.x86_64.rpm + filename=gpfs.msg.en_US-3.5.0-7.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=teal-sfp-1.2.0.0-1.x86_64.rpm + filename=gpfs.src-3.5.0-7.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base kitpackage: - filename=teal-test-1.2.0.2-1.x86_64.rpm + filename=gpfs.libsrc-3.5.0-7.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir= + rpm_prebuiltdir=base diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/gpfs.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/gpfs.exlist new file mode 100755 index 000000000..e019951c7 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/gpfs.exlist @@ -0,0 +1,3 @@ +./usr/lpp/mmfs/include* +./usr/lpp/mmfs/samples* + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/min-gpfs.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/min-gpfs.exlist new file mode 100755 index 000000000..ccb5ebe96 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/min-gpfs.exlist @@ -0,0 +1,5 @@ +# Exclude list for building a minimal diskless image + +./usr/lpp/mmfs/include* +./usr/lpp/mmfs/samples* +./usr/lpp/mmfs/src* diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/sample/exclude.lst b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/sample/exclude.lst new file mode 100644 index 000000000..e69de29bb diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/sample/kitdeployparams.lst b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/other_files/sample/kitdeployparams.lst new file mode 100644 index 000000000..e69de29bb diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/plugins/sample/imageprofile.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/plugins/sample/imageprofile.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/plugins/sample/imageprofile.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/plugins/sample/nodemgmt.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/plugins/sample/nodemgmt.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/plugins/sample/nodemgmt.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_config b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_config new file mode 100755 index 000000000..9850b01b6 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-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/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_config_storage b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-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/gpfs-3.5.0-7-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/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_mmsdrfs b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_mmsdrfs new file mode 100755 index 000000000..95b3d05b1 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_mmsdrfs @@ -0,0 +1,30 @@ +#!/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 + echo "Restoring GPFS configration file from server." + /usr/lpp/mmfs/bin/mmsdrrestore -p $GPFSMGR -R /usr/bin/scp & +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_start b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_start new file mode 100755 index 000000000..5f13c81ca --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_start @@ -0,0 +1,19 @@ +#!/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 + +hostname=`hostname -s`; + +if [ !-z $NODE ] +then + hostname=`echo $NODE | awk -F-hf '{print $1}'` +fi + +/usr/lpp/mmfs/bin/mmchlicense client --accept -N $hostname +/usr/lpp/mmfs/bin/mmstartup + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_update new file mode 100755 index 000000000..a27b5ebc9 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_update_storage b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_update_storage new file mode 100755 index 000000000..dd5ceec90 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_update_storage @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/buildkit.conf similarity index 65% rename from xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/buildkit.conf index 02378ad1f..31335f439 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/buildkit.conf @@ -21,11 +21,12 @@ # parameters, relative to # /other_files kit: - basename=pessl - description=pessl for Linux - version=4.2.0 + basename=gpfs + description=General Parallel File System + version=3.5.0-7 ostype=Linux - kitdeployparams=pessl.env + kitlicense=IPLA + #kitdeployparams= # kitrepo: This section defines a Kit Package Repository. @@ -51,13 +52,14 @@ kitrepo: osmajorversion=6 osarch=ppc64 + #compat_osbasenames= + kitrepo: kitrepoid=sles11_ppc64 osbasename=sles 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, @@ -93,7 +95,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 @@ -110,71 +112,130 @@ kitrepo: # preinstall, postinstall, preuninstall, postuninstall, # preupgrade, postupgrade, postbootscripts kitcomponent: - basename=pessl_compute - description=pessl for compute nodes - version=4.2.0 - release=0 - serverroles=compute + basename=gpfs_compute + description=GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.man >= 4.2.0,pessl.msg >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=pessl.exlist + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=rhels_gpfs_compute_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=pessl_login - description=pessl for login nodes - version=4.2.0 - release=0 + basename=min_gpfs_compute + description=Minimal GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode + kitrepoid=rhels6_ppc64 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 + exlist=min-gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=rhels_min_gpfs_compute_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + +kitcomponent: + basename=gpfs_login + description=GPFS for login nodes + version=3.5.0 + release=7 serverroles=login kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.man >= 4.2.0,pessl.msg >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=pessl.exlist + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=rhels_gpfs_login_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=min_pessl_compute - description=Minimal pessl for compute nodes - version=4.2.0 - release=0 - serverroles=compute + basename=gpfs_storage + description=GPFS for storage nodes + version=3.5.0 + release=7 + serverroles=storage,servicenode kitrepoid=rhels6_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=min-pessl.exlist - + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=rhels_gpfs_storage_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=pessl_compute - description=pessl for compute nodes - version=4.2.0 - release=0 - serverroles=compute + basename=gpfs_compute + description=GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.man >= 4.2.0,pessl.msg >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=pessl.exlist + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 ,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=sles_gpfs_compute_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=essl_login - description=pessl for login nodes - version=4.2.0 - release=0 + basename=min_gpfs_compute + description=Minimal GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode + kitrepoid=sles11_ppc64 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,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_config + genimage_postinstall=sles_min_gpfs_compute_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + +kitcomponent: + basename=gpfs_login + description=GPFS for login nodes + version=3.5.0 + release=7 serverroles=login kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.man >= 4.2.0,pessl.msg >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=pessl.exlist + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=sles_gpfs_login_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=min_pessl_compute - description=Minimal pessl for compute nodes - version=4.2.0 - release=0 - serverroles=compute + basename=gpfs_storage + description=GPFS for storage nodes + version=3.5.0 + release=7 + serverroles=storage,servicenode kitrepoid=sles11_ppc64 - ospkgdeps=bc,xorg-x11-libXp-32bit - kitpkgdeps=pessl.3232.rte.mpich >= 4.2.0,pessl.3232.rte.ppe >= 4.2.0,pessl.3264.rte.mpich >= 4.2.0,pessl.3264.rte.ppe >= 4.2.0,pessl.common >= 4.2.0,pessl.license >= 4.2.0,pessl.rte.common >= 4.2.0 - exlist=min-pessl.exlist + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=sles_gpfs_storage_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.ppc64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + # kitpackage: This section defines one Kit Package, and how to build it. @@ -224,62 +285,42 @@ kitcomponent: # 4. Build RPM from source RPM # rpm_srpm: Path to source RPM package. kitpackage: - filename=pessl.3232.rte.mpich-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - -kitpackage: - filename=pessl.3232.rte.ppe-4.2.0-0.ppc64.rpm + filename=gpfs.base-3.5.0-7.ppc64.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=pessl.3264.rte.mpich-4.2.0-0.ppc64.rpm + filename=gpfs.gpl-3.5.0-7.noarch.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=pessl.3264.rte.ppe-4.2.0-0.ppc64.rpm + filename=gpfs.docs-3.5.0-7.noarch.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=pessl.common-4.2.0-0.ppc64.rpm + filename=gpfs.msg.en_US-3.5.0-7.noarch.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=pessl.license-4.2.0-0.ppc64.rpm + filename=gpfs.libsrc-3.5.0-7.noarch.rpm kitrepoid=rhels6_ppc64,sles11_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=pessl.man-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=pessl.msg-4.2.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=pessl.rte.common-4.2.0-0.ppc64.rpm + filename=gpfs.src-3.5.0-7.noarch.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/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/gpfs.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/gpfs.exlist new file mode 100755 index 000000000..e019951c7 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/gpfs.exlist @@ -0,0 +1,3 @@ +./usr/lpp/mmfs/include* +./usr/lpp/mmfs/samples* + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/min-gpfs.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/min-gpfs.exlist new file mode 100755 index 000000000..ccb5ebe96 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/min-gpfs.exlist @@ -0,0 +1,5 @@ +# Exclude list for building a minimal diskless image + +./usr/lpp/mmfs/include* +./usr/lpp/mmfs/samples* +./usr/lpp/mmfs/src* diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/sample/exclude.lst b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/sample/exclude.lst new file mode 100644 index 000000000..e69de29bb diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/sample/kitdeployparams.lst b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/other_files/sample/kitdeployparams.lst new file mode 100644 index 000000000..e69de29bb diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/plugins/sample/imageprofile.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/plugins/sample/imageprofile.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/plugins/sample/imageprofile.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/plugins/sample/nodemgmt.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/plugins/sample/nodemgmt.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/plugins/sample/nodemgmt.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_config b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-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-7-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-7-Linux-ppc64/scripts/gpfs_config_storage b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-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-7-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-7-Linux-ppc64/scripts/gpfs_mmsdrfs b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_mmsdrfs new file mode 100755 index 000000000..95b3d05b1 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_mmsdrfs @@ -0,0 +1,30 @@ +#!/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 + echo "Restoring GPFS configration file from server." + /usr/lpp/mmfs/bin/mmsdrrestore -p $GPFSMGR -R /usr/bin/scp & +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_start b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/gpfs_start new file mode 100755 index 000000000..18bd1d1ee --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/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/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_gpfs_compute_update new file mode 100755 index 000000000..1e705acb8 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_gpfs_compute_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_gpfs_login_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_gpfs_login_update new file mode 100755 index 000000000..bd969291a --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_gpfs_login_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_gpfs_storage_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_gpfs_storage_update new file mode 100755 index 000000000..b84e88924 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_gpfs_storage_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_min_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_min_gpfs_compute_update new file mode 100755 index 000000000..05b5aaaa4 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/rhels_min_gpfs_compute_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_gpfs_compute_update new file mode 100755 index 000000000..521c2eb0c --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_gpfs_compute_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-sles-11-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_gpfs_login_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_gpfs_login_update new file mode 100755 index 000000000..fee3ca9cd --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_gpfs_login_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-sles-11-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_gpfs_storage_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_gpfs_storage_update new file mode 100755 index 000000000..5a3d53550 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_gpfs_storage_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-sles-11-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-sles-11-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-sles-11-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_min_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_min_gpfs_compute_update new file mode 100755 index 000000000..05b5aaaa4 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-ppc64/scripts/sles_min_gpfs_compute_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-ppc64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/buildkit.conf similarity index 65% rename from xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-x86_64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/buildkit.conf index 7f7989638..a3612c053 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/buildkit.conf @@ -21,11 +21,12 @@ # parameters, relative to # /other_files kit: - basename=teal - description=teal for Linux - version=1.2.0.2 + basename=gpfs + description=General Parallel File System + version=3.5.0-7 ostype=Linux -# kitdeployparams= + kitlicense=IPLA + #kitdeployparams= # kitrepo: This section defines a Kit Package Repository. @@ -51,13 +52,14 @@ kitrepo: osmajorversion=6 osarch=x86_64 + #compat_osbasenames= + kitrepo: kitrepoid=sles11_x86_64 osbasename=sles 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, @@ -79,7 +81,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,mgtnode,login,storage,utility +# mgtnode,servicenode,compute,login,storage,utility # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -93,7 +95,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 @@ -110,112 +112,134 @@ kitrepo: # preinstall, postinstall, preuninstall, postuninstall, # preupgrade, postupgrade, postbootscripts kitcomponent: - basename=teal-base - description=teal for management nodes - version=1.2.0.2 - release=1 - serverroles=mgtnode + basename=gpfs_compute + description=GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-base >= 1.2.0.2 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=rhels_gpfs_compute_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-isnm - description=teal for isnm - version=1.2.0.1 - release=1 - serverroles=mgtnode + basename=min_gpfs_compute + description=Minimal GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-isnm >= 1.2.0.1 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,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_config + genimage_postinstall=rhels_min_gpfs_compute_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-ll - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode + basename=gpfs_login + description=GPFS for login nodes + version=3.5.0 + release=7 + serverroles=login kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-isnm >= 1.2.0.0 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=rhels_gpfs_login_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-pnsd - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode + basename=gpfs_storage + description=GPFS for storage nodes + version=3.5.0 + release=7 + serverroles=storage,servicenode kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-pnsd >= 1.2.0.0 + #kitcompdeps= + ospkgdeps=yum + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=rhels_gpfs_storage_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-sfp - description=teal for sfp - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-sfp >= 1.2.0.0 - -kitcomponent: - basename=teal-test - description=teal test - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-test >= 1.2.0.2 - -kitcomponent: - basename=teal-base - description=teal for management nodes - version=1.2.0.2 - release=1 - serverroles=mgtnode + basename=gpfs_compute + description=GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=sles11_x86_64 - kitpkgdeps=teal-base >= 1.2.0.2 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0 ,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=sles_gpfs_compute_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-isnm - description=teal for isnm - version=1.2.0.1 - release=1 - serverroles=mgtnode + basename=min_gpfs_compute + description=Minimal GPFS for compute nodes + version=3.5.0 + release=7 + serverroles=compute,servicenode kitrepoid=sles11_x86_64 - kitpkgdeps=teal-isnm >= 1.2.0.1 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,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_config + genimage_postinstall=sles_min_gpfs_compute_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-ll - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode + basename=gpfs_login + description=GPFS for login nodes + version=3.5.0 + release=7 + serverroles=login kitrepoid=sles11_x86_64 - kitpkgdeps=teal-isnm >= 1.2.0.0 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config + genimage_postinstall=sles_gpfs_login_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: - basename=teal-pnsd - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=sles11_x86_64 - kitpkgdeps=teal-pnsd >= 1.2.0.0 - -kitcomponent: - basename=teal-sfp - description=teal for sfp - version=1.2.0.0 - release=1 - serverroles=mgtnode + basename=gpfs_storage + description=GPFS for storage nodes + version=3.5.0 + release=7 + serverroles=storage,servicenode kitrepoid=sles11_x86_64 - kitpkgdeps=teal-sfp >= 1.2.0.0 + #kitcompdeps= + ospkgdeps=zypper + kitpkgdeps=gpfs.libsrc >= 3.5.0,gpfs.src >= 3.5.0,gpfs.base >= 3.5.0,gpfs.gpl >= 3.5.0,gpfs.msg.en_US >= 3.5.0,gpfs.docs >= 3.5.0 + #driverpacks= + exlist=gpfs.exlist + postbootscripts=gpfs_mmsdrfs,gpfs_start,gpfs_config_storage + genimage_postinstall=sles_gpfs_storage_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-3.5.0-7.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + -kitcomponent: - basename=teal-test - description=teal test - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=sles11_x86_64 - kitpkgdeps=teal-test >= 1.2.0.2 # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. @@ -264,42 +288,42 @@ kitcomponent: # 4. Build RPM from source RPM # rpm_srpm: Path to source RPM package. kitpackage: - filename=teal-base-1.2.0.2-1.x86_64.rpm + filename=gpfs.base-3.5.0-7.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-isnm-1.2.0.1-1.x86_64.rpm + filename=gpfs.gpl-3.5.0-7.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-ll-1.2.0.0-1.x86_64.rpm + filename=gpfs.docs-3.5.0-7.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-pnsd-1.2.0.0-1.x86_64.rpm + filename=gpfs.msg.en_US-3.5.0-7.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-sfp-1.2.0.0-1.x86_64.rpm + filename=gpfs.src-3.5.0-7.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-test-1.2.0.2-1.x86_64.rpm + filename=gpfs.libsrc-3.5.0-7.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-7-Linux-x86_64/other_files/gpfs.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/other_files/gpfs.exlist new file mode 100755 index 000000000..e019951c7 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/other_files/gpfs.exlist @@ -0,0 +1,3 @@ +./usr/lpp/mmfs/include* +./usr/lpp/mmfs/samples* + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/other_files/min-gpfs.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/other_files/min-gpfs.exlist new file mode 100755 index 000000000..ccb5ebe96 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/other_files/min-gpfs.exlist @@ -0,0 +1,5 @@ +# Exclude list for building a minimal diskless image + +./usr/lpp/mmfs/include* +./usr/lpp/mmfs/samples* +./usr/lpp/mmfs/src* diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/other_files/sample/exclude.lst b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/other_files/sample/exclude.lst new file mode 100644 index 000000000..e69de29bb diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/other_files/sample/kitdeployparams.lst b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/other_files/sample/kitdeployparams.lst new file mode 100644 index 000000000..e69de29bb diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-ppc64/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/plugins/sample/imageprofile.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-ppc64/plugins/sample/imageprofile.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/plugins/sample/imageprofile.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-ppc64/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/plugins/sample/nodemgmt.pm similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-ppc64/plugins/sample/nodemgmt.pm rename to xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/plugins/sample/nodemgmt.pm diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_config b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-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-7-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-7-Linux-x86_64/scripts/gpfs_config_storage b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-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-7-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-7-Linux-x86_64/scripts/gpfs_mmsdrfs b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_mmsdrfs new file mode 100755 index 000000000..95b3d05b1 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_mmsdrfs @@ -0,0 +1,30 @@ +#!/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 + echo "Restoring GPFS configration file from server." + /usr/lpp/mmfs/bin/mmsdrrestore -p $GPFSMGR -R /usr/bin/scp & +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_start b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/gpfs_start new file mode 100755 index 000000000..18bd1d1ee --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/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/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_gpfs_compute_update new file mode 100755 index 000000000..a27b5ebc9 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_gpfs_compute_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_gpfs_login_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_gpfs_login_update new file mode 100755 index 000000000..ca22e35ed --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_gpfs_login_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-rhels-6-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-rhels-6-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_gpfs_storage_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_gpfs_storage_update new file mode 100755 index 000000000..dd5ceec90 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_gpfs_storage_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-rhels-6-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_min_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_min_gpfs_compute_update new file mode 100755 index 000000000..fd53fd866 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/rhels_min_gpfs_compute_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_gpfs_compute_update new file mode 100755 index 000000000..f031a6986 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_gpfs_compute_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-sles-11-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-7-sles-11-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_gpfs_login_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_gpfs_login_update new file mode 100755 index 000000000..c667a112b --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_gpfs_login_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-sles-11-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_login-3.5.0-7-sles-11-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_gpfs_storage_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_gpfs_storage_update new file mode 100755 index 000000000..85a90f06d --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_gpfs_storage_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-sles-11-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-7-sles-11-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_min_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_min_gpfs_compute_update new file mode 100755 index 000000000..fd53fd866 --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-7-Linux-x86_64/scripts/sles_min_gpfs_compute_update @@ -0,0 +1,13 @@ +#!/bin/sh + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm + fi +else + if [ -n "`ls /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-7-rhels-6-x86_64/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/other_files/min-pessl.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/other_files/min-pessl.exlist deleted file mode 100755 index 903c93802..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/other_files/min-pessl.exlist +++ /dev/null @@ -1,5 +0,0 @@ -./opt/ibmmath/pessl/*/lap/LA_* -./opt/ibmmath/pessl/*/lap/LI_* -./opt/ibmmath/pessl/*/lap/*.jar -./opt/ibmmath/pessl/*/example* - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/other_files/pessl.env b/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/other_files/pessl.env deleted file mode 100644 index 90146f379..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/other_files/pessl.env +++ /dev/null @@ -1 +0,0 @@ -#ENV:IBM_PESSL_LICENSE_ACCEPT=yes# diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/other_files/pessl.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/other_files/pessl.exlist deleted file mode 100755 index 4ef49f9c7..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/partial-pessl/other_files/pessl.exlist +++ /dev/null @@ -1,5 +0,0 @@ -./opt/ibmmath/pessl/*/lap/LA_* -./opt/ibmmath/pessl/*/lap/LI_* -./opt/ibmmath/pessl/*/lap/*.jar - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/other_files/min-pessl.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/other_files/min-pessl.exlist deleted file mode 100755 index 903c93802..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/other_files/min-pessl.exlist +++ /dev/null @@ -1,5 +0,0 @@ -./opt/ibmmath/pessl/*/lap/LA_* -./opt/ibmmath/pessl/*/lap/LI_* -./opt/ibmmath/pessl/*/lap/*.jar -./opt/ibmmath/pessl/*/example* - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/other_files/pessl.env b/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/other_files/pessl.env deleted file mode 100644 index 90146f379..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/other_files/pessl.env +++ /dev/null @@ -1 +0,0 @@ -#ENV:IBM_PESSL_LICENSE_ACCEPT=yes# diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/other_files/pessl.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/other_files/pessl.exlist deleted file mode 100755 index 4ef49f9c7..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/pessl/pessl/other_files/pessl.exlist +++ /dev/null @@ -1,5 +0,0 @@ -./opt/ibmmath/pessl/*/lap/LA_* -./opt/ibmmath/pessl/*/lap/LI_* -./opt/ibmmath/pessl/*/lap/*.jar - - 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-1.3.0.0-ppc64/buildkit.conf similarity index 96% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/buildkit.conf index b6f6bd465..16a417727 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-1.3.0.0-ppc64/buildkit.conf @@ -25,6 +25,7 @@ kit: description=Parallel Environment Runtime Edition version=1.3.0.0 ostype=Linux + kitlicense=IPLA kitdeployparams=pe.env @@ -112,7 +113,7 @@ kitcomponent: serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=yum,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 @@ -127,7 +128,7 @@ kitcomponent: serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=yum,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 @@ -142,7 +143,7 @@ kitcomponent: serverroles=login kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=yum,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 @@ -158,7 +159,7 @@ kitcomponent: serverroles=compute kitrepoid=sles11_ppc64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs 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 @@ -173,7 +174,7 @@ kitcomponent: serverroles=compute kitrepoid=sles11_ppc64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall @@ -188,7 +189,7 @@ kitcomponent: serverroles=login kitrepoid=sles11_ppc64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs 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 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/other_files/pe.env b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/other_files/pe.env similarity index 97% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/other_files/pe.env rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/other_files/pe.env index f2d982d78..27d8b4473 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/other_files/pe.env +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/other_files/pe.env @@ -1,2 +1 @@ #ENV:IBM_PPE_RTE_LICENSE_ACCEPT=yes# - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/other_files/pe.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/other_files/pe.exlist new file mode 100755 index 000000000..c8a7cdabc --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/other_files/pe.exlist @@ -0,0 +1,11 @@ +./opt/ibmhpc/lapi/include* +./opt/ibmhpc/lapi/pnsd/include* +./opt/ibmhpc/lapi/samples* + +./opt/ibmhpc/pecurrent/ppe.poe/include* +./opt/ibmhpc/pecurrent/ppe.poe/man/* +./opt/ibmhpc/pecurrent/ppe.poe/samples* +./opt/ibmhpc/pecurrent/hal/include* +./etc/opt/ibmhpc/license/*.txt + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/scripts/pperte_postboot b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/scripts/pperte_postboot similarity index 83% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/scripts/pperte_postboot rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/scripts/pperte_postboot index c68c69ce5..54c01a009 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/scripts/pperte_postboot +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/scripts/pperte_postboot @@ -12,6 +12,14 @@ $gen_xlf fi +if [ ! -z "$NODESETSTATE" ]; then + if [ "$NODESETSTATE" != "netboot" ] || [ "$NODESETSTATE" != "statelite" ]; then + /sbin/srcmstr & + stopsrc -s pnsd + startsrc -s pnsd + fi +fi + #Generate checkpoint key and store it into the image, ckpt script could ust it after boot. # KEY=$(dd if=/dev/random count=1 2>/dev/null | sha1sum | awk '{print $1}') # echo $KEY > /root/.ckpt.key 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-1.3.0.0-ppc64/scripts/pperte_postinstall similarity index 81% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/scripts/pperte_postinstall rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-ppc64/scripts/pperte_postinstall index cab6bafa7..01e305926 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-1.3.0.0-ppc64/scripts/pperte_postinstall @@ -55,5 +55,16 @@ if ! grep "max nofile" /etc/security/limits.conf >/dev/null 2>&1 ; then echo "# End of file" >> /etc/security/limits.conf fi +# several sysctl parameters. +if ! grep "ppe rte sysctl parameters" /etc/sysctl.conf >/dev/null 2>&1 ; then + echo "#ppe rte sysctl parameters" >> /etc/sysctl.conf + echo "net.core.wmem_max = 1048576" >> /etc/sysctl.conf + echo "net.core.rmem_max = 8388608" >> /etc/sysctl.conf + echo "net.ipv4.ipfrag_low_thresh = 1048576" >> /etc/sysctl.conf + echo "net.ipv4.ipfrag_high_thresh = 8388608" >> /etc/sysctl.conf +fi +if [ -f "/proc/cmdline" ]; then + /sbin/sysctl -p +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-1.3.0.0-x86_64/buildkit.conf similarity index 95% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/buildkit.conf index f1d96ba05..93e37c413 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-1.3.0.0-x86_64/buildkit.conf @@ -25,6 +25,7 @@ kit: description=Parallel Environment Runtime Edition version=1.3.0.0 ostype=Linux + kitlicense=IPLA kitdeployparams=pe.env @@ -112,7 +113,7 @@ kitcomponent: serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=yum,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 @@ -127,7 +128,7 @@ kitcomponent: serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=yum,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 @@ -142,7 +143,7 @@ kitcomponent: serverroles=login kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=yum,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 @@ -158,7 +159,7 @@ kitcomponent: serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs 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 @@ -173,7 +174,7 @@ kitcomponent: serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall @@ -188,7 +189,7 @@ kitcomponent: serverroles=login kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs 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 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/other_files/pe.env b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/other_files/pe.env similarity index 97% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/other_files/pe.env rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/other_files/pe.env index f2d982d78..27d8b4473 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/other_files/pe.env +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/other_files/pe.env @@ -1,2 +1 @@ #ENV:IBM_PPE_RTE_LICENSE_ACCEPT=yes# - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/other_files/pe.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/other_files/pe.exlist new file mode 100644 index 000000000..c8a7cdabc --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/other_files/pe.exlist @@ -0,0 +1,11 @@ +./opt/ibmhpc/lapi/include* +./opt/ibmhpc/lapi/pnsd/include* +./opt/ibmhpc/lapi/samples* + +./opt/ibmhpc/pecurrent/ppe.poe/include* +./opt/ibmhpc/pecurrent/ppe.poe/man/* +./opt/ibmhpc/pecurrent/ppe.poe/samples* +./opt/ibmhpc/pecurrent/hal/include* +./etc/opt/ibmhpc/license/*.txt + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/scripts/pperte_postboot b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/scripts/pperte_postboot similarity index 83% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/scripts/pperte_postboot rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/scripts/pperte_postboot index c68c69ce5..54c01a009 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/scripts/pperte_postboot +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/scripts/pperte_postboot @@ -12,6 +12,14 @@ $gen_xlf fi +if [ ! -z "$NODESETSTATE" ]; then + if [ "$NODESETSTATE" != "netboot" ] || [ "$NODESETSTATE" != "statelite" ]; then + /sbin/srcmstr & + stopsrc -s pnsd + startsrc -s pnsd + fi +fi + #Generate checkpoint key and store it into the image, ckpt script could ust it after boot. # KEY=$(dd if=/dev/random count=1 2>/dev/null | sha1sum | awk '{print $1}') # echo $KEY > /root/.ckpt.key 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-1.3.0.0-x86_64/scripts/pperte_postinstall similarity index 81% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/scripts/pperte_postinstall rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.0-x86_64/scripts/pperte_postinstall index cab6bafa7..01e305926 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-1.3.0.0-x86_64/scripts/pperte_postinstall @@ -55,5 +55,16 @@ if ! grep "max nofile" /etc/security/limits.conf >/dev/null 2>&1 ; then echo "# End of file" >> /etc/security/limits.conf fi +# several sysctl parameters. +if ! grep "ppe rte sysctl parameters" /etc/sysctl.conf >/dev/null 2>&1 ; then + echo "#ppe rte sysctl parameters" >> /etc/sysctl.conf + echo "net.core.wmem_max = 1048576" >> /etc/sysctl.conf + echo "net.core.rmem_max = 8388608" >> /etc/sysctl.conf + echo "net.ipv4.ipfrag_low_thresh = 1048576" >> /etc/sysctl.conf + echo "net.ipv4.ipfrag_high_thresh = 8388608" >> /etc/sysctl.conf +fi +if [ -f "/proc/cmdline" ]; then + /sbin/sysctl -p +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/other_files/pe.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/other_files/pe.exlist deleted file mode 100755 index 847caaab1..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/other_files/pe.exlist +++ /dev/null @@ -1,11 +0,0 @@ -./opt/ibmhpc/lapi/include* -./opt/ibmhpc/lapi/pnsd/include* -./opt/ibmhpc/lapi/samples* - -./opt/ibmhpc/ppe.poe/include* -./opt/ibmhpc/ppe.poe/man/* -./opt/ibmhpc/ppe.poe/samples* -./opt/ibmhpc/hal/include* -./etc/opt/ibmhpc/license/*.txt - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/other_files/pe.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/other_files/pe.exlist deleted file mode 100755 index 847caaab1..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-x86_64/other_files/pe.exlist +++ /dev/null @@ -1,11 +0,0 @@ -./opt/ibmhpc/lapi/include* -./opt/ibmhpc/lapi/pnsd/include* -./opt/ibmhpc/lapi/samples* - -./opt/ibmhpc/ppe.poe/include* -./opt/ibmhpc/ppe.poe/man/* -./opt/ibmhpc/ppe.poe/samples* -./opt/ibmhpc/hal/include* -./etc/opt/ibmhpc/license/*.txt - - 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-1.3.0.0-ppc64/buildkit.conf similarity index 96% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/buildkit.conf index 5ba717b99..d2ea4710c 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/buildkit.conf @@ -25,6 +25,7 @@ kit: description=Parallel Environment Runtime Edition version=1.3.0.0 ostype=Linux + kitlicense=IPLA kitdeployparams=pe.env @@ -112,7 +113,7 @@ kitcomponent: serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=yum,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 @@ -127,7 +128,7 @@ kitcomponent: serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=yum,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 @@ -142,7 +143,7 @@ kitcomponent: serverroles=login kitrepoid=rhels6_ppc64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=yum,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 @@ -158,7 +159,7 @@ kitcomponent: serverroles=compute kitrepoid=sles11_ppc64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs 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 @@ -173,7 +174,7 @@ kitcomponent: serverroles=compute kitrepoid=sles11_ppc64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0 exlist=pe.exlist postinstall=pperte_postinstall @@ -188,7 +189,7 @@ kitcomponent: serverroles=login kitrepoid=sles11_ppc64 #kitcompdeps= - ospkgdeps=at,rsh,rsh-server,sudo,libibverbs(ppc-32),libibverbs(ppc-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs 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 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/other_files/pe.env b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/other_files/pe.env similarity index 97% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/other_files/pe.env rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/other_files/pe.env index f2d982d78..27d8b4473 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/other_files/pe.env +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/other_files/pe.env @@ -1,2 +1 @@ #ENV:IBM_PPE_RTE_LICENSE_ACCEPT=yes# - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/other_files/pe.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/other_files/pe.exlist new file mode 100644 index 000000000..c8a7cdabc --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/other_files/pe.exlist @@ -0,0 +1,11 @@ +./opt/ibmhpc/lapi/include* +./opt/ibmhpc/lapi/pnsd/include* +./opt/ibmhpc/lapi/samples* + +./opt/ibmhpc/pecurrent/ppe.poe/include* +./opt/ibmhpc/pecurrent/ppe.poe/man/* +./opt/ibmhpc/pecurrent/ppe.poe/samples* +./opt/ibmhpc/pecurrent/hal/include* +./etc/opt/ibmhpc/license/*.txt + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/scripts/pperte_postboot b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/scripts/pperte_postboot similarity index 83% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/scripts/pperte_postboot rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/scripts/pperte_postboot index 367fbebd6..54c01a009 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-ppc64/scripts/pperte_postboot +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/scripts/pperte_postboot @@ -12,11 +12,19 @@ $gen_xlf fi +if [ ! -z "$NODESETSTATE" ]; then + if [ "$NODESETSTATE" != "netboot" ] || [ "$NODESETSTATE" != "statelite" ]; then + /sbin/srcmstr & + stopsrc -s pnsd + startsrc -s pnsd + fi +fi + #Generate checkpoint key and store it into the image, ckpt script could ust it after boot. # KEY=$(dd if=/dev/random count=1 2>/dev/null | sha1sum | awk '{print $1}') # echo $KEY > /root/.ckpt.key # chmod 400 /root/.ckpt.key - +# # BSR configuration, uncomment the following lines to enable BSR configuration on Power Linux cluster. # groupadd bsr 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-1.3.0.0-ppc64/scripts/pperte_postinstall similarity index 81% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/scripts/pperte_postinstall rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-ppc64/scripts/pperte_postinstall index cab6bafa7..01e305926 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-1.3.0.0-ppc64/scripts/pperte_postinstall @@ -55,5 +55,16 @@ if ! grep "max nofile" /etc/security/limits.conf >/dev/null 2>&1 ; then echo "# End of file" >> /etc/security/limits.conf fi +# several sysctl parameters. +if ! grep "ppe rte sysctl parameters" /etc/sysctl.conf >/dev/null 2>&1 ; then + echo "#ppe rte sysctl parameters" >> /etc/sysctl.conf + echo "net.core.wmem_max = 1048576" >> /etc/sysctl.conf + echo "net.core.rmem_max = 8388608" >> /etc/sysctl.conf + echo "net.ipv4.ipfrag_low_thresh = 1048576" >> /etc/sysctl.conf + echo "net.ipv4.ipfrag_high_thresh = 8388608" >> /etc/sysctl.conf +fi +if [ -f "/proc/cmdline" ]; then + /sbin/sysctl -p +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-1.3.0.0-x86_64/buildkit.conf similarity index 96% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/buildkit.conf index 640d603c5..90949824c 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-1.3.0.0-x86_64/buildkit.conf @@ -25,6 +25,7 @@ kit: description=Parallel Environment Runtime Edition version=1.3.0.0 ostype=Linux + kitlicense=IPLA kitdeployparams=pe.env @@ -112,7 +113,7 @@ kitcomponent: serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=yum,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 @@ -127,7 +128,7 @@ kitcomponent: serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=yum,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 @@ -142,7 +143,7 @@ kitcomponent: serverroles=login kitrepoid=rhels6_x86_64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=yum,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 @@ -158,7 +159,7 @@ kitcomponent: serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs 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 @@ -173,7 +174,7 @@ kitcomponent: serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.0,src exlist=pe.exlist postinstall=pperte_postinstall @@ -188,7 +189,7 @@ kitcomponent: serverroles=login kitrepoid=sles11_x86_64 #kitcompdeps= - ospkgdeps=at,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) + ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs 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 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/other_files/pe.env b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/other_files/pe.env similarity index 97% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/other_files/pe.env rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/other_files/pe.env index f2d982d78..27d8b4473 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/other_files/pe.env +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/other_files/pe.env @@ -1,2 +1 @@ #ENV:IBM_PPE_RTE_LICENSE_ACCEPT=yes# - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/other_files/pe.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/other_files/pe.exlist new file mode 100644 index 000000000..c8a7cdabc --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/other_files/pe.exlist @@ -0,0 +1,11 @@ +./opt/ibmhpc/lapi/include* +./opt/ibmhpc/lapi/pnsd/include* +./opt/ibmhpc/lapi/samples* + +./opt/ibmhpc/pecurrent/ppe.poe/include* +./opt/ibmhpc/pecurrent/ppe.poe/man/* +./opt/ibmhpc/pecurrent/ppe.poe/samples* +./opt/ibmhpc/pecurrent/hal/include* +./etc/opt/ibmhpc/license/*.txt + + diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/scripts/pperte_postboot b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/scripts/pperte_postboot similarity index 83% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/scripts/pperte_postboot rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/scripts/pperte_postboot index 367fbebd6..54c01a009 100755 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/scripts/pperte_postboot +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/scripts/pperte_postboot @@ -12,11 +12,19 @@ $gen_xlf fi +if [ ! -z "$NODESETSTATE" ]; then + if [ "$NODESETSTATE" != "netboot" ] || [ "$NODESETSTATE" != "statelite" ]; then + /sbin/srcmstr & + stopsrc -s pnsd + startsrc -s pnsd + fi +fi + #Generate checkpoint key and store it into the image, ckpt script could ust it after boot. # KEY=$(dd if=/dev/random count=1 2>/dev/null | sha1sum | awk '{print $1}') # echo $KEY > /root/.ckpt.key # chmod 400 /root/.ckpt.key - +# # BSR configuration, uncomment the following lines to enable BSR configuration on Power Linux cluster. # groupadd bsr 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-1.3.0.0-x86_64/scripts/pperte_postinstall similarity index 81% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/scripts/pperte_postinstall rename to xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-1.3.0.0-x86_64/scripts/pperte_postinstall index cab6bafa7..01e305926 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-1.3.0.0-x86_64/scripts/pperte_postinstall @@ -55,5 +55,16 @@ if ! grep "max nofile" /etc/security/limits.conf >/dev/null 2>&1 ; then echo "# End of file" >> /etc/security/limits.conf fi +# several sysctl parameters. +if ! grep "ppe rte sysctl parameters" /etc/sysctl.conf >/dev/null 2>&1 ; then + echo "#ppe rte sysctl parameters" >> /etc/sysctl.conf + echo "net.core.wmem_max = 1048576" >> /etc/sysctl.conf + echo "net.core.rmem_max = 8388608" >> /etc/sysctl.conf + echo "net.ipv4.ipfrag_low_thresh = 1048576" >> /etc/sysctl.conf + echo "net.ipv4.ipfrag_high_thresh = 8388608" >> /etc/sysctl.conf +fi +if [ -f "/proc/cmdline" ]; then + /sbin/sysctl -p +fi diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/other_files/pe.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/other_files/pe.exlist deleted file mode 100755 index 847caaab1..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-ppc64/other_files/pe.exlist +++ /dev/null @@ -1,11 +0,0 @@ -./opt/ibmhpc/lapi/include* -./opt/ibmhpc/lapi/pnsd/include* -./opt/ibmhpc/lapi/samples* - -./opt/ibmhpc/ppe.poe/include* -./opt/ibmhpc/ppe.poe/man/* -./opt/ibmhpc/ppe.poe/samples* -./opt/ibmhpc/hal/include* -./etc/opt/ibmhpc/license/*.txt - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/other_files/pe.exlist b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/other_files/pe.exlist deleted file mode 100644 index 847caaab1..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/pperte-x86_64/other_files/pe.exlist +++ /dev/null @@ -1,11 +0,0 @@ -./opt/ibmhpc/lapi/include* -./opt/ibmhpc/lapi/pnsd/include* -./opt/ibmhpc/lapi/samples* - -./opt/ibmhpc/ppe.poe/include* -./opt/ibmhpc/ppe.poe/man/* -./opt/ibmhpc/ppe.poe/samples* -./opt/ibmhpc/hal/include* -./etc/opt/ibmhpc/license/*.txt - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-ppc64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-ppc64/buildkit.conf similarity index 90% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-ppc64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-ppc64/buildkit.conf index 525bfba9d..9d9449709 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-ppc64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-ppc64/buildkit.conf @@ -23,8 +23,9 @@ kit: basename=ppedev description=Parallel Environment Developer Edition - version=1.3.0 + version=1.2.0-1 ostype=Linux + kitlicense=IPLA kitdeployparams=ppedev.env @@ -33,7 +34,7 @@ kit: # If you want to support multiple OSes, you should create a separate # repo for each OS. Also, no two repos can be defined with the same # OS name, major/minor version and arch. For example, you cannot have -# two repos for RHEL 6.2 x86_64 in the same kit. +# two repos for RHEL 6.2 ppc64 in the same kit. # # kitrepo attributes: # kitrepoid (mandatory) Kit package repository ID. @@ -41,7 +42,7 @@ kit: # osbasename (mandatory) OS distro base name. e.g., rhels. # osmajorversion (mandatory) OS major version. e.g., 6 # osminorversion (optional) OS minor version. -# osarch (mandatory) OS architecture. e.g., x86_64 +# osarch (mandatory) OS architecture. e.g., ppc64 # compat_osbasenames (optional) Comma-separated list of compatible # OS distro base names. e.g., centos @@ -51,6 +52,7 @@ kitrepo: osmajorversion=6 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, @@ -72,7 +74,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility +# mgtnode,servicenode,compute,loginnode,storagenode # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -105,26 +107,24 @@ kitrepo: kitcomponent: basename=ppedev_compute description=ppe developer edition for compute node - version=1.3.0 - release=0 + version=1.2.0 + release=1 serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_rh6p >= 1.3.0-0,ppedev_ptp_rte_rh6p >= 1.3.0-0,ppedev_runtime_rh6p >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_rh6p >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_rh6p >= 1.2.0-1,ppedev_runtime_rh6p >= 1.2.0-1,ppedev_license >= 1.2.0 kitcomponent: - basename=ppedev_login + basename=ppedev_loginnode description=ppe developer edition for compute node - version=1.3.0 - release=0 + version=1.2.0 + release=1 serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_rh6p >= 1.3.0-0,ppedev_ptp_rte_rh6p >= 1.3.0-0,ppedev_runtime_rh6p >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_rh6p >= 1.3.0-0 - - + kitpkgdeps=ppedev_hpct_rh6p >= 1.2.0-1,ppedev_runtime_rh6p >= 1.2.0-1,ppedev_license >= 1.2.0,ppedev_ptp_rte_rh6p >= 1.2.0-1 # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. @@ -174,35 +174,28 @@ kitcomponent: # rpm_srpm: Path to source RPM package. kitpackage: - filename=ppedev_hpct_rh6p-1.3.0-0.ppc64.rpm + filename=ppedev_hpct_rh6p-1.2.0-1.ppc64.rpm kitrepoid=rhels6_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppedev_license-1.3.0-0.ppc64.rpm + filename=ppedev_license-1.2.0-1.ppc64.rpm kitrepoid=rhels6_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppedev_ptp_rh6p-1.3.0-0.ppc64.rpm + filename=ppedev_ptp_rte_rh6p-1.2.0-1.ppc64.rpm kitrepoid=rhels6_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppedev_ptp_rte_rh6p-1.3.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=ppedev_runtime_rh6p-1.3.0-0.ppc64.rpm + filename=ppedev_runtime_rh6p-1.2.0-1.ppc64.rpm kitrepoid=rhels6_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=yes diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-ppc64/other_files/ppedev.env b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-ppc64/other_files/ppedev.env similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-ppc64/other_files/ppedev.env rename to xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-ppc64/other_files/ppedev.env diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-x86_64/buildkit.conf similarity index 83% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-x86_64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-x86_64/buildkit.conf index d3575483b..2938121e9 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-x86_64/buildkit.conf @@ -23,8 +23,9 @@ kit: basename=ppedev description=Parallel Environment Developer Edition - version=1.3.0 + version=1.2.0-1 ostype=Linux + kitlicense=IPLA kitdeployparams=ppedev.env @@ -58,9 +59,6 @@ kitrepo: osarch=x86_64 - #compat_osbasenames= - - # 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, @@ -82,7 +80,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility +# mgtnode,servicenode,compute,loginnode,storagenode # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -115,46 +113,46 @@ kitrepo: kitcomponent: basename=ppedev_compute description=ppe developer edition for compute node - version=1.3.0 - release=0 + version=1.2.0 + release=1 serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_rh6x >= 1.3.0-0,ppedev_ptp_rte_rh6x >= 1.3.0-0,ppedev_runtime_rh6x >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_rh6x >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_rh6x >= 1.2.0-1,ppedev_runtime_rh6x >= 1.2.0-1,ppedev_license >= 1.2.0 kitcomponent: - basename=ppedev_login - description=ppe developer edition for login node - version=1.3.0 - release=0 - serverroles=login + basename=ppedev_loginnode + description=ppe developer edition for compute node + version=1.2.0 + release=1 + serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_rh6x >= 1.3.0-0,ppedev_ptp_rte_rh6x >= 1.3.0-0,ppedev_runtime_rh6x >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_rh6x >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_rh6x >= 1.2.0-1,ppedev_runtime_rh6x >= 1.2.0-1,ppedev_license >= 1.2.0,ppedev_ptp_rte_rh6x >= 1.2.0-1 kitcomponent: basename=ppedev_compute description=ppe developer edition for compute node - version=1.3.0 - release=0 + version=1.2.0 + release=1 serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_sles11x >= 1.3.0-0,ppedev_ptp_rte_sles11x >= 1.3.0-0,ppedev_runtime_sles11x >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_sles11x >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_sles11x >= 1.2.0-1,ppedev_runtime_sles11x >= 1.2.0-1,ppedev_license >= 1.2.0 kitcomponent: - basename=ppedev_login - description=ppe developer edition for login node - version=1.3.0 - release=0 - serverroles=login + basename=ppedev_loginnode + description=ppe developer edition for compute node + version=1.2.0 + release=1 + serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_sles11x >= 1.3.0-0,ppedev_ptp_rte_sles11x >= 1.3.0-0,ppedev_runtime_sles11x >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_sles11x >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_sles11x >= 1.2.0-1,ppedev_runtime_sles11x >= 1.2.0-1,ppedev_license >= 1.2.0,ppedev_ptp_rte_sles11x >= 1.2.0-1 @@ -206,76 +204,57 @@ kitcomponent: # rpm_srpm: Path to source RPM package. kitpackage: - filename=ppedev_hpct_rh6x-1.3.0-0.x86_64.rpm + filename=ppedev_hpct_rh6x-1.2.0-1.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppedev_license-1.3.0-0.x86_64.rpm + filename=ppedev_license-1.2.0-1.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppedev_ptp_rh6x-1.3.0-0.x86_64.rpm + filename=ppedev_ptp_rte_rh6x-1.2.0-1.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppedev_ptp_rte_rh6x-1.3.0-0.x86_64.rpm + filename=ppedev_runtime_rh6x-1.2.0-1.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppedev_runtime_rh6x-1.3.0-0.x86_64.rpm - kitrepoid=rhels6_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=ppedev_license-1.3.0-0.x86_64.rpm + filename=ppedev_hpct_sles11x-1.2.0-1.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes - - -kitpackage: - filename=ppedev_ptp_rte_sles11x-1.3.0-0.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - kitpackage: - filename=ppedev_ptp_sles11x-1.3.0-0.x86_64.rpm + filename=ppedev_license-1.2.0-1.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes - + kitpackage: - filename=ppedev_hpct_sles11x-1.3.0-0.x86_64.rpm + filename=ppedev_ptp_rte_sles11x-1.2.0-1.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes - kitpackage: - filename=ppedev_runtime_sles11x-1.3.0-0.x86_64.rpm + filename=ppedev_runtime_sles11x-1.2.0-1.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes - - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-x86_64/other_files/ppedev.env b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-x86_64/other_files/ppedev.env similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-x86_64/other_files/ppedev.env rename to xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-1-x86_64/other_files/ppedev.env diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-ppc64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-ppc64/buildkit.conf similarity index 87% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-ppc64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-ppc64/buildkit.conf index b10cfc4ad..e2e88045e 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-ppc64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-ppc64/buildkit.conf @@ -23,8 +23,9 @@ kit: basename=ppedev description=Parallel Environment Developer Edition - version=1.3.0 + version=1.2.0-1 ostype=Linux + kitlicense=IPLA kitdeployparams=ppedev.env @@ -33,7 +34,7 @@ kit: # If you want to support multiple OSes, you should create a separate # repo for each OS. Also, no two repos can be defined with the same # OS name, major/minor version and arch. For example, you cannot have -# two repos for RHEL 6.2 x86_64 in the same kit. +# two repos for RHEL 6.2 ppc64 in the same kit. # # kitrepo attributes: # kitrepoid (mandatory) Kit package repository ID. @@ -41,7 +42,7 @@ kit: # osbasename (mandatory) OS distro base name. e.g., rhels. # osmajorversion (mandatory) OS major version. e.g., 6 # osminorversion (optional) OS minor version. -# osarch (mandatory) OS architecture. e.g., x86_64 +# osarch (mandatory) OS architecture. e.g., ppc64 # compat_osbasenames (optional) Comma-separated list of compatible # OS distro base names. e.g., centos @@ -50,7 +51,6 @@ kitrepo: osbasename=rhels osmajorversion=6 osarch=ppc64 - #compat_osbasenames= # kitcomponent: This section defines one Kit Component. @@ -74,7 +74,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility +# mgtnode,servicenode,compute,loginnode,storagenode # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -107,26 +107,24 @@ kitrepo: kitcomponent: basename=ppedev_compute description=ppe developer edition for compute node - version=1.3.0 - release=0 + version=1.2.0 + release=1 serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_rh6p >= 1.3.0-0,ppedev_ptp_rte_rh6p >= 1.3.0-0,ppedev_runtime_rh6p >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_rh6p >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_rh6p >= 1.2.0-1,ppedev_runtime_rh6p >= 1.2.0-1,ppedev_license >= 1.2.0 kitcomponent: - basename=ppedev_login + basename=ppedev_loginnode description=ppe developer edition for compute node - version=1.3.0 - release=0 - serverroles=login + version=1.2.0 + release=1 + serverroles=compute kitrepoid=rhels6_ppc64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_rh6p >= 1.3.0-0,ppedev_ptp_rte_rh6p >= 1.3.0-0,ppedev_runtime_rh6p >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_rh6p >= 1.3.0-0 - - + kitpkgdeps=ppedev_hpct_rh6p >= 1.2.0-1,ppedev_runtime_rh6p >= 1.2.0-1,ppedev_license >= 1.2.0,ppedev_ptp_rte_rh6p >= 1.2.0-1 # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. @@ -176,36 +174,30 @@ kitcomponent: # rpm_srpm: Path to source RPM package. kitpackage: - filename=ppedev_hpct_rh6p-1.3.0-0.ppc64.rpm + filename=ppedev_hpct_rh6p-1.2.0-1.ppc64.rpm kitrepoid=rhels6_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=pwr64_redhat_6.0.0 + rpm_prebuiltdir= kitpackage: - filename=ppedev_license-1.3.0-0.ppc64.rpm + filename=ppedev_license-1.2.0-1.ppc64.rpm kitrepoid=rhels6_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=pwr64_redhat_6.0.0 + rpm_prebuiltdir= + kitpackage: - filename=ppedev_ptp_rh6p-1.3.0-0.ppc64.rpm + filename=ppedev_ptp_rte_rh6p-1.2.0-1.ppc64.rpm kitrepoid=rhels6_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=pwr64_redhat_6.0.0 + rpm_prebuiltdir= kitpackage: - filename=ppedev_ptp_rte_rh6p-1.3.0-0.ppc64.rpm + filename=ppedev_runtime_rh6p-1.2.0-1.ppc64.rpm kitrepoid=rhels6_ppc64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=pwr64_redhat_6.0.0 - -kitpackage: - filename=ppedev_runtime_rh6p-1.3.0-0.ppc64.rpm - kitrepoid=rhels6_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=pwr64_redhat_6.0.0 + rpm_prebuiltdir= diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-ppc64/other_files/ppedev.env b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-ppc64/other_files/ppedev.env similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-ppc64/other_files/ppedev.env rename to xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-ppc64/other_files/ppedev.env diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-x86_64/buildkit.conf similarity index 81% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-x86_64/buildkit.conf rename to xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-x86_64/buildkit.conf index 6730ca576..a5be1885a 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-x86_64/buildkit.conf @@ -23,8 +23,9 @@ kit: basename=ppedev description=Parallel Environment Developer Edition - version=1.3.0 + version=1.2.0-1 ostype=Linux + kitlicense=IPLA kitdeployparams=ppedev.env @@ -58,9 +59,6 @@ kitrepo: osarch=x86_64 - #compat_osbasenames= - - # 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, @@ -82,7 +80,7 @@ kitrepo: # release (mandatory) Kit component release # serverroles (mandatory) Comma-separated list of servers that this # component can install on. Valid values: -# mgtnode,servicenode,compute,login,storage,utility +# mgtnode,servicenode,compute,loginnode,storagenode # kitrepoid (mandatory) The ID of the kit package repository this # component belongs to # kitcompdeps (optional) Comma-separated list of kit component @@ -115,46 +113,46 @@ kitrepo: kitcomponent: basename=ppedev_compute description=ppe developer edition for compute node - version=1.3.0 - release=0 + version=1.2.0 + release=1 serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_rh6x >= 1.3.0-0,ppedev_ptp_rte_rh6x >= 1.3.0-0,ppedev_runtime_rh6x >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_rh6x >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_rh6x >= 1.2.0-1,ppedev_runtime_rh6x >= 1.2.0-1,ppedev_license >= 1.2.0 kitcomponent: - basename=ppedev_login - description=ppe developer edition for login node - version=1.3.0 - release=0 - serverroles=login + basename=ppedev_loginnode + description=ppe developer edition for compute node + version=1.2.0 + release=1 + serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_rh6x >= 1.3.0-0,ppedev_ptp_rte_rh6x >= 1.3.0-0,ppedev_runtime_rh6x >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_rh6x >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_rh6x >= 1.2.0-1,ppedev_runtime_rh6x >= 1.2.0-1,ppedev_license >= 1.2.0,ppedev_ptp_rte_rh6x >= 1.2.0-1 kitcomponent: basename=ppedev_compute description=ppe developer edition for compute node - version=1.3.0 - release=0 + version=1.2.0 + release=1 serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_sles11x >= 1.3.0-0,ppedev_ptp_rte_sles11x >= 1.3.0-0,ppedev_runtime_sles11x >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_sles11x >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_sles11x >= 1.2.0-1,ppedev_runtime_sles11x >= 1.2.0-1,ppedev_license >= 1.2.0 kitcomponent: - basename=ppedev_login - description=ppe developer edition for login node - version=1.3.0 - release=0 - serverroles=login + basename=ppedev_loginnode + description=ppe developer edition for compute node + version=1.2.0 + release=1 + serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= #ospkgdeps= - kitpkgdeps=ppedev_hpct_sles11x >= 1.3.0-0,ppedev_ptp_rte_sles11x >= 1.3.0-0,ppedev_runtime_sles11x >= 1.3.0-0,ppedev_license >= 1.3.0-0,ppedev_ptp_sles11x >= 1.3.0-0 + kitpkgdeps=ppedev_hpct_sles11x >= 1.2.0-1,ppedev_runtime_sles11x >= 1.2.0-1,ppedev_license >= 1.2.0,ppedev_ptp_rte_sles11x >= 1.2.0-1 @@ -206,76 +204,65 @@ kitcomponent: # rpm_srpm: Path to source RPM package. kitpackage: - filename=ppedev_hpct_rh6x-1.3.0-0.x86_64.rpm + filename=ppedev_hpct_rh6x-1.2.0-1.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 + rpm_prebuiltdir= + kitpackage: - filename=ppedev_license-1.3.0-0.x86_64.rpm + filename=ppedev_license-1.2.0-1.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 + rpm_prebuiltdir= + kitpackage: - filename=ppedev_ptp_rh6x-1.3.0-0.x86_64.rpm + filename=ppedev_ptp_rte_rh6x-1.2.0-1.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 + rpm_prebuiltdir= + kitpackage: - filename=ppedev_ptp_rte_rh6x-1.3.0-0.x86_64.rpm + filename=ppedev_runtime_rh6x-1.2.0-1.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_redhat_6.0.0 + rpm_prebuiltdir= + kitpackage: - filename=ppedev_runtime_rh6x-1.3.0-0.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=ppedev_license-1.3.0-0.x86_64.rpm + filename=ppedev_hpct_sles11x-1.2.0-1.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=ppedev_ptp_rte_sles11x-1.3.0-0.x86_64.rpm - kitrepoid=sles11_x86_64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 + rpm_prebuiltdir= kitpackage: - filename=ppedev_ptp_sles11x-1.3.0-0.x86_64.rpm + filename=ppedev_license-1.2.0-1.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 + rpm_prebuiltdir= + kitpackage: - filename=ppedev_hpct_sles11x-1.3.0-0.x86_64.rpm + filename=ppedev_ptp_rte_sles11x-1.2.0-1.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 + rpm_prebuiltdir= kitpackage: - filename=ppedev_runtime_sles11x-1.3.0-0.x86_64.rpm + filename=ppedev_runtime_sles11x-1.2.0-1.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=no - rpm_prebuiltdir=amd64_sles_11.0.0 - - + rpm_prebuiltdir= diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-x86_64/other_files/ppedev.env b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-x86_64/other_files/ppedev.env similarity index 100% rename from xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-x86_64/other_files/ppedev.env rename to xCAT-buildkit/share/xcat/kits/kit_build/ppedev/ppedev-1.2.0-1-x86_64/other_files/ppedev.env diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-ppc64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-ppc64/buildkit.conf deleted file mode 100644 index 846824fa2..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-ppc64/buildkit.conf +++ /dev/null @@ -1,306 +0,0 @@ -# Kit Build File -# -# This file was initially auto-generated by the buildkit CLI command. -# To create a new kit, the user should modify this file accordingly. -# Refer to the buildkit manpage for further details. -# - -# kit: This section defines general info for the Kit. -# There must be exactly one kit section in a kit build file. -# -# kit attributes: -# basename (mandatory) Kit base name. e.g., kit-lsf -# description (optional) Kit description. -# version (mandatory) Kit version. e.g., 1.0 -# ostype (mandatory) Kit OS type. Must be Linux. -# AIX is currently not supported. -# isinternal (optional) PCM use only. -# Indicate if Kit is for internal use. -# Use 1 for yes, 0 for no. Default: 0 -# kitdeployparams (optional) Filename containing a list of kit deployment -# parameters, relative to -# /other_files -kit: - basename=teal - description=teal for Linux - version=1.2.0.2 - ostype=Linux -# kitdeployparams= - - -# kitrepo: This section defines a Kit Package Repository. -# There must be at least one kitrepo section in a kit build file. -# If you want to support multiple OSes, you should create a separate -# repo for each OS. Also, no two repos can be defined with the same -# OS name, major/minor version and arch. For example, you cannot have -# two repos for RHEL 6.2 ppc64 in the same kit. -# -# kitrepo attributes: -# kitrepoid (mandatory) Kit package repository ID. -# Must be unique within this file. -# osbasename (mandatory) OS distro base name. e.g., rhels. -# osmajorversion (mandatory) OS major version. e.g., 6 -# osminorversion (optional) OS minor version. -# osarch (mandatory) OS architecture. e.g., ppc64 -# compat_osbasenames (optional) Comma-separated list of compatible -# OS distro base names. e.g., centos - -kitrepo: - kitrepoid=rhels6_ppc64 - osbasename=rhels - osmajorversion=6 - osarch=ppc64 - -kitrepo: - kitrepoid=sles11_ppc64 - osbasename=sles - 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, -# you should create one kitcomponent section for each OS. -# Also, no two components in a kit can be defined with the same -# base name. -# You can define multiple kit components with the same base name -# only if each kit component using this base name meets these -# requirements: -# - Each kit component must be defined with the same version -# and release number -# - Each kit component must be defined with a unique kitrepoid - -# -# kitcomponent attributes: -# basename (mandatory) Kit component base name -# description (optional) Kit component description -# version (mandatory) Kit component version -# release (mandatory) Kit component release -# serverroles (mandatory) Comma-separated list of servers that this -# component can install on. Valid values: -# mgtnode,servicenode,mgtnode,login,storage,utility -# kitrepoid (mandatory) The ID of the kit package repository this -# component belongs to -# kitcompdeps (optional) Comma-separated list of kit component -# dependencies. These kit components can be included in -# this kit or in other kits. -# ospkgdeps (optional) Comma-separated list of OS package dependencies -# These packages must be shipped with the OS distro. -# kitpkgdeps (optional) Comma-separated list of kit package names that -# will be listed as "REQUIRES" when building this kit -# component. Each package must be defined in a separate -# 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 -# paths that will be included as files in this kit -# component. All filenames are relative to -# /source_packages -# Kit component deployment scripts must be specified -# to manage these files. -# driverpacks (optional) Comma-separated list of driver package filenames -# Each driverpack must be defined in a separate kitpackage -# section. -# exlist (optional) Exclude list file for stateless image, relative -# to /other_files -# Kit component deployment scripts (optional) Each attribute specifies -# script path relative to /scripts -# Script attributes: -# preinstall, postinstall, preuninstall, postuninstall, -# preupgrade, postupgrade, postbootscripts -kitcomponent: - basename=teal-base - description=teal for management nodes - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-base >= 1.2.0.2 - -kitcomponent: - basename=teal-isnm - description=teal for isnm - version=1.2.0.1 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-isnm >= 1.2.0.1 - -kitcomponent: - basename=teal-ll - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-isnm >= 1.2.0.0 - -kitcomponent: - basename=teal-pnsd - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-pnsd >= 1.2.0.0 - -kitcomponent: - basename=teal-sfp - description=teal for sfp - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-sfp >= 1.2.0.0 - -kitcomponent: - basename=teal-test - description=teal test - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-test >= 1.2.0.2 - -kitcomponent: - basename=teal-base - description=teal for management nodes - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-base >= 1.2.0.2 - -kitcomponent: - basename=teal-isnm - description=teal for isnm - version=1.2.0.1 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-isnm >= 1.2.0.1 - -kitcomponent: - basename=teal-ll - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-isnm >= 1.2.0.0 - -kitcomponent: - basename=teal-pnsd - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-pnsd >= 1.2.0.0 - -kitcomponent: - basename=teal-sfp - description=teal for sfp - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-sfp >= 1.2.0.0 - -kitcomponent: - basename=teal-test - description=teal test - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-test >= 1.2.0.2 - -# kitpackage: This section defines one Kit Package, and how to build it. -# There can be zero or more kitpackage sections. -# All filenames should be relative paths to -# /source_packages -# If you want to build a package which can run on multiple OSes, -# you have two options: -# 1. Build a separate package for each OS you want to support. -# For this option, you need to define one kitpackage section -# per supported OS. -# 2. Build one package that can run on multiple OSes. -# If you are building an RPM package, you are responsible for -# creating an RPM spec file that can run on multiple OSes. -# For this option, you need to define one kitpackage section -# which contains multiple kitrepoid lines. -# -# kitpackage attributes: -# filename (mandatory) Package filename -# kitrepoid (mandatory) The repo(s) this package belongs to. -# If multiple repos are defined, the package will be built for -# the first repo only. For the other repos, a symlink is created -# to the package built for the first repo. -# Package build methods (optional) -# Define how to build the packages. -# If you don't specify a build method, the default behavior is -# to assume the package is pre-built under -# /source_packages -# All files in this section are relative to -# /source_packages -# There are four methods to build packages. -# 1. Use pre-built RPM package -# isexternalpkg: 'no'|'0', 'yes'|'1' (default: 'no') -# Indicates whether the RPM package will be added to the -# the kit tar file now as part of the kit build process, -# 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=yes, path to directory -# containing pre-built RPM package -# 2. Build RPM from spec + src dir -# rpm_spec: Path to spec file. -# rpm_srcdir: Path to source directory. -# 3. Build RPM from spec + src tarball -# rpm_spec: Path to spec file. -# rpm_srctarball: Path to source tarball. -# 4. Build RPM from source RPM -# rpm_srpm: Path to source RPM package. -kitpackage: - filename=teal-base-1.2.0.2-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=teal-isnm-1.2.0.1-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=teal-ll-1.2.0.0-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=teal-pnsd-1.2.0.0-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=teal-sfp-1.2.0.0-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=yes - - -kitpackage: - filename=teal-test-1.2.0.2-1.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/teal/partial-teal-x86_64/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-x86_64/plugins/sample/imageprofile.pm deleted file mode 100644 index f42b70e7f..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-x86_64/plugins/sample/imageprofile.pm +++ /dev/null @@ -1,175 +0,0 @@ -package xCAT_plugin::<<>>_imageprofile; - -use strict; -use warnings; - -require xCAT::Utils; -require xCAT::Table; -require xCAT::KitPluginUtils; - - -# buildkit Processing -# In order to avoid collisions with other plugins, the package -# name for this plugin must contain the full kit name. -# The buildkit buildtar command will copy this file from your plugins -# directory to the the kit build directory, renaming the file with the -# correct kit name. All strings in this file of the form -# <<>> -# will be replaced with the full kit name. In order for buildkit to -# correctly edit this file, do not remove these strings. - - -# Global Variables - -# This is the full name of the kit which this plugin belongs -# to. The kit name is used by some code in process_request() -# to determine if the plugin should run. When you are testing -# your plugin the kit name should be set to "TESTMODE" to -# bypass the plugin check in process_request(). - -our ($PLUGIN_KITNAME); -#$PLUGIN_KITNAME = "TESTMODE"; -$PLUGIN_KITNAME = "<<>>"; - - -#------------------------------------------------------- - -=head1 - - Image Profile Kit Plugin - This plugin contains commands to run custom actions - during image profile operations. - -=cut - -#------------------------------------------------------- - - -#------------------------------------------------------- - -=head3 handled_commands - - Return list of kit plugin commands handled by this plugin - -=cut - -#------------------------------------------------------- - -sub handled_commands { - return { - kitimagevalidatecomps => '<<>>_imageprofile', - kitimageimport => '<<>>_imageprofile', - }; -} - - -#------------------------------------------------------- - -=head3 process_request - - Process the kit plugin command. - -=cut - -#------------------------------------------------------- - -sub process_request { - my $request = shift; - my $callback = shift; - - # This kit plugin is passed the name of an image profile. - # We need to determine which kits is used by this - # image profile to decide if this plugin should run or not. - - my $imgprofilename = $request->{arg}->[0]; - - my $kitdata = $request->{kitdata}; - if (! defined($kitdata)) { - $kitdata = xCAT::KitPluginUtils->get_kits_used_by_image_profiles([$imgprofilename]); - $request->{kitdata} = $kitdata; - } - - if ($PLUGIN_KITNAME ne "TESTMODE" && ! exists($kitdata->{$PLUGIN_KITNAME})) { - return; - } - - # Name of command and node list - my $command = $request->{command}->[0]; - my $args = $request->{arg}; - - if($command eq 'kitimagevalidatecomps') { - kitimagevalidatecomps($callback, $args); - } - elsif ($command eq 'kitimageimport') { - kitimageimport($callback, $args); - - } else { - my $rsp; - $rsp->{data}->[0] = "Command is not supported"; - xCAT::MsgUtils->message("E", $rsp, $callback); - } -} - - -#------------------------------------------------------- - -=head3 kitimagevalidatecomps - - This command is called to validate new changes to an - image profile's kit component list before the changes - are committed. - -=cut - -#------------------------------------------------------- - -sub kitimagevalidatecomps { - my $callback = shift; - my $args = shift; - my $rsp; - - # Parameters - my $imgprofilename = $args->[0]; - my $newcomplist = $args->[1]; - my @newcomplist = (); - if (defined($newcomplist)) { - @newcomplist = split(/,/, $newcomplist); - } - my $newosdistro = $args->[2]; - my $newosdistroupdate = $args->[3]; - - $rsp->{data}->[0] = "Running kitimagevalidatecomps"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitimageimport - - This command is called after changes to an image profile - have been committed. - -=cut - -#------------------------------------------------------- - -sub kitimageimport { - my $callback = shift; - my $args = shift; - my $rsp; - - # Parameters - my $imgprofilename = $args->[0]; - - $rsp->{data}->[0] = "Running kitimageimport"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-x86_64/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-x86_64/plugins/sample/nodemgmt.pm deleted file mode 100644 index 1eb766eb7..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-x86_64/plugins/sample/nodemgmt.pm +++ /dev/null @@ -1,251 +0,0 @@ -package xCAT_plugin::<<>>_nodemgmt; - -use strict; -use warnings; - -require xCAT::Utils; -require xCAT::Table; -require xCAT::KitPluginUtils; - -# buildkit Processing -# In order to avoid collisions with other plugins, the package -# name for this plugin must contain the full kit name. -# The buildkit buildtar command will copy this file from your plugins -# directory to the the kit build directory, renaming the file with the -# correct kit name. All strings in this file of the form -# <<>> -# will be replaced with the full kit name. In order for buildkit to -# correctly edit this file, do not remove these strings. - -# Global Variables - -# This is the full name of the kit which this plugin belongs -# to. The kit name is used by some code in process_request() -# to determine if the plugin should run. When you are testing -# your plugin the kit name should be set to "TESTMODE" to -# bypass the plugin check in process_request(). - -our ($PLUGIN_KITNAME); -#$PLUGIN_KITNAME = "TESTMODE"; -$PLUGIN_KITNAME = "<<>>"; - - -#------------------------------------------------------- - -=head1 - - Node Management Kit Plugin - This plugin contains commands to run custom actions - during node management operations. - -=cut - -#------------------------------------------------------- - - -#------------------------------------------------------- - -=head3 handled_commands - - Return list of kit plugin commands handled by this plugin - -=cut - -#------------------------------------------------------- - -sub handled_commands { - return { - kitnodeadd => '<<>>_nodemgmt', - kitnoderemove => '<<>>_nodemgmt', - kitnodeupdate => '<<>>_nodemgmt', - kitnoderefresh => '<<>>_nodemgmt', - kitnodefinished => '<<>>_nodemgmt', - }; -} - - -#------------------------------------------------------- - -=head3 process_request - - Process the kit plugin command. - -=cut - -#------------------------------------------------------- - -sub process_request { - my $request = shift; - my $callback = shift; - - # Name of command and node list - my $command = $request->{command}->[0]; - my $nodes = $request->{node}; - - # This kit plugin is passed a list of node names. - # We need to determine which kits are used by these - # nodes to decide if this plugin should run or not. - - my $kitdata = $request->{kitdata}; - if (! defined($kitdata)) { - $kitdata = xCAT::KitPluginUtils->get_kits_used_by_nodes($nodes); - $request->{kitdata} = $kitdata; - } - - if ($PLUGIN_KITNAME ne "TESTMODE" && ! exists($kitdata->{$PLUGIN_KITNAME})) { - return; - } - - # Get the nodes using this plugin's kit - $nodes = $kitdata->{$PLUGIN_KITNAME}; - - - if($command eq 'kitnodeadd') { - kitnodeadd($callback, $nodes); - } - elsif ($command eq 'kitnoderemove') { - kitnoderemove($callback, $nodes); - } - elsif ($command eq 'kitnodeupdate') { - kitnodeupdate($callback, $nodes); - } - elsif ($command eq 'kitnoderefresh') { - kitnoderefresh($callback, $nodes); - } - elsif ($command eq 'kitnodefinished') { - kitnodefinished($callback); - - } else { - my $rsp; - $rsp->{data}->[0] = "Command is not supported"; - xCAT::MsgUtils->message("E", $rsp, $callback); - } -} - - -#------------------------------------------------------- - -=head3 kitnodeadd - - This command is called when one or more nodes are added - to the cluster. - -=cut - -#------------------------------------------------------- - -sub kitnodeadd { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnodeadd"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnoderemove - - This command is called when one or more nodes are - removed from the cluster. - -=cut - -#------------------------------------------------------- - -sub kitnoderemove { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnoderemove"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnodeupdate - - This command is called when the configuration of one - or more nodes are updated. - -=cut - -#------------------------------------------------------- - -sub kitnodeupdate { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnodeupdate"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnoderefresh - - This command is called when node-related configuration - files are updated. - -=cut - -#------------------------------------------------------- - -sub kitnoderefresh { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnoderefresh"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnodefinished - - This command is called at the end of a node management - operation. - -=cut - -#------------------------------------------------------- - -sub kitnodefinished { - my $callback = shift; - my $rsp; - - $rsp->{data}->[0] = "Running kitnodefinished"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-ppc64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-ppc64/buildkit.conf deleted file mode 100644 index d131fb6a6..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-ppc64/buildkit.conf +++ /dev/null @@ -1,306 +0,0 @@ -# Kit Build File -# -# This file was initially auto-generated by the buildkit CLI command. -# To create a new kit, the user should modify this file accordingly. -# Refer to the buildkit manpage for further details. -# - -# kit: This section defines general info for the Kit. -# There must be exactly one kit section in a kit build file. -# -# kit attributes: -# basename (mandatory) Kit base name. e.g., kit-lsf -# description (optional) Kit description. -# version (mandatory) Kit version. e.g., 1.0 -# ostype (mandatory) Kit OS type. Must be Linux. -# AIX is currently not supported. -# isinternal (optional) PCM use only. -# Indicate if Kit is for internal use. -# Use 1 for yes, 0 for no. Default: 0 -# kitdeployparams (optional) Filename containing a list of kit deployment -# parameters, relative to -# /other_files -kit: - basename=teal - description=teal for Linux - version=1.2.0.2 - ostype=Linux -# kitdeployparams= - - -# kitrepo: This section defines a Kit Package Repository. -# There must be at least one kitrepo section in a kit build file. -# If you want to support multiple OSes, you should create a separate -# repo for each OS. Also, no two repos can be defined with the same -# OS name, major/minor version and arch. For example, you cannot have -# two repos for RHEL 6.2 ppc64 in the same kit. -# -# kitrepo attributes: -# kitrepoid (mandatory) Kit package repository ID. -# Must be unique within this file. -# osbasename (mandatory) OS distro base name. e.g., rhels. -# osmajorversion (mandatory) OS major version. e.g., 6 -# osminorversion (optional) OS minor version. -# osarch (mandatory) OS architecture. e.g., ppc64 -# compat_osbasenames (optional) Comma-separated list of compatible -# OS distro base names. e.g., centos - -kitrepo: - kitrepoid=rhels6_ppc64 - osbasename=rhels - osmajorversion=6 - osarch=ppc64 - -kitrepo: - kitrepoid=sles11_ppc64 - osbasename=sles - 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, -# you should create one kitcomponent section for each OS. -# Also, no two components in a kit can be defined with the same -# base name. -# You can define multiple kit components with the same base name -# only if each kit component using this base name meets these -# requirements: -# - Each kit component must be defined with the same version -# and release number -# - Each kit component must be defined with a unique kitrepoid - -# -# kitcomponent attributes: -# basename (mandatory) Kit component base name -# description (optional) Kit component description -# version (mandatory) Kit component version -# release (mandatory) Kit component release -# serverroles (mandatory) Comma-separated list of servers that this -# component can install on. Valid values: -# mgtnode,servicenode,mgtnode,login,storage,utility -# kitrepoid (mandatory) The ID of the kit package repository this -# component belongs to -# kitcompdeps (optional) Comma-separated list of kit component -# dependencies. These kit components can be included in -# this kit or in other kits. -# ospkgdeps (optional) Comma-separated list of OS package dependencies -# These packages must be shipped with the OS distro. -# kitpkgdeps (optional) Comma-separated list of kit package names that -# will be listed as "REQUIRES" when building this kit -# component. Each package must be defined in a separate -# 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 -# paths that will be included as files in this kit -# component. All filenames are relative to -# /source_packages -# Kit component deployment scripts must be specified -# to manage these files. -# driverpacks (optional) Comma-separated list of driver package filenames -# Each driverpack must be defined in a separate kitpackage -# section. -# exlist (optional) Exclude list file for stateless image, relative -# to /other_files -# Kit component deployment scripts (optional) Each attribute specifies -# script path relative to /scripts -# Script attributes: -# preinstall, postinstall, preuninstall, postuninstall, -# preupgrade, postupgrade, postbootscripts -kitcomponent: - basename=teal-base - description=teal for management nodes - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-base >= 1.2.0.2 - -kitcomponent: - basename=teal-isnm - description=teal for isnm - version=1.2.0.1 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-isnm >= 1.2.0.1 - -kitcomponent: - basename=teal-ll - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-isnm >= 1.2.0.0 - -kitcomponent: - basename=teal-pnsd - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-pnsd >= 1.2.0.0 - -kitcomponent: - basename=teal-sfp - description=teal for sfp - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-sfp >= 1.2.0.0 - -kitcomponent: - basename=teal-test - description=teal test - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=rhels6_ppc64 - kitpkgdeps=teal-test >= 1.2.0.2 - -kitcomponent: - basename=teal-base - description=teal for management nodes - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-base >= 1.2.0.2 - -kitcomponent: - basename=teal-isnm - description=teal for isnm - version=1.2.0.1 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-isnm >= 1.2.0.1 - -kitcomponent: - basename=teal-ll - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-isnm >= 1.2.0.0 - -kitcomponent: - basename=teal-pnsd - description=teal for pnsd - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-pnsd >= 1.2.0.0 - -kitcomponent: - basename=teal-sfp - description=teal for sfp - version=1.2.0.0 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-sfp >= 1.2.0.0 - -kitcomponent: - basename=teal-test - description=teal test - version=1.2.0.2 - release=1 - serverroles=mgtnode - kitrepoid=sles11_ppc64 - kitpkgdeps=teal-test >= 1.2.0.2 - -# kitpackage: This section defines one Kit Package, and how to build it. -# There can be zero or more kitpackage sections. -# All filenames should be relative paths to -# /source_packages -# If you want to build a package which can run on multiple OSes, -# you have two options: -# 1. Build a separate package for each OS you want to support. -# For this option, you need to define one kitpackage section -# per supported OS. -# 2. Build one package that can run on multiple OSes. -# If you are building an RPM package, you are responsible for -# creating an RPM spec file that can run on multiple OSes. -# For this option, you need to define one kitpackage section -# which contains multiple kitrepoid lines. -# -# kitpackage attributes: -# filename (mandatory) Package filename -# kitrepoid (mandatory) The repo(s) this package belongs to. -# If multiple repos are defined, the package will be built for -# the first repo only. For the other repos, a symlink is created -# to the package built for the first repo. -# Package build methods (optional) -# Define how to build the packages. -# If you don't specify a build method, the default behavior is -# to assume the package is pre-built under -# /source_packages -# All files in this section are relative to -# /source_packages -# There are four methods to build packages. -# 1. Use pre-built RPM package -# isexternalpkg: 'no'|'0', 'yes'|'1' (default: 'no') -# Indicates whether the RPM package will be added to the -# the kit tar file now as part of the kit build process, -# 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 -# containing pre-built RPM package -# 2. Build RPM from spec + src dir -# rpm_spec: Path to spec file. -# rpm_srcdir: Path to source directory. -# 3. Build RPM from spec + src tarball -# rpm_spec: Path to spec file. -# rpm_srctarball: Path to source tarball. -# 4. Build RPM from source RPM -# rpm_srpm: Path to source RPM package. -kitpackage: - filename=teal-base-1.2.0.2-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= - -kitpackage: - filename=teal-isnm-1.2.0.1-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= - -kitpackage: - filename=teal-ll-1.2.0.0-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= - -kitpackage: - filename=teal-pnsd-1.2.0.0-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= - -kitpackage: - filename=teal-sfp-1.2.0.0-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= - -kitpackage: - filename=teal-test-1.2.0.2-1.ppc64.rpm - kitrepoid=rhels6_ppc64,sles11_ppc64 - # Method 1: Use pre-built RPM package - isexternalpkg=no - rpm_prebuiltdir= diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-ppc64/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-ppc64/plugins/sample/imageprofile.pm deleted file mode 100644 index f42b70e7f..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-ppc64/plugins/sample/imageprofile.pm +++ /dev/null @@ -1,175 +0,0 @@ -package xCAT_plugin::<<>>_imageprofile; - -use strict; -use warnings; - -require xCAT::Utils; -require xCAT::Table; -require xCAT::KitPluginUtils; - - -# buildkit Processing -# In order to avoid collisions with other plugins, the package -# name for this plugin must contain the full kit name. -# The buildkit buildtar command will copy this file from your plugins -# directory to the the kit build directory, renaming the file with the -# correct kit name. All strings in this file of the form -# <<>> -# will be replaced with the full kit name. In order for buildkit to -# correctly edit this file, do not remove these strings. - - -# Global Variables - -# This is the full name of the kit which this plugin belongs -# to. The kit name is used by some code in process_request() -# to determine if the plugin should run. When you are testing -# your plugin the kit name should be set to "TESTMODE" to -# bypass the plugin check in process_request(). - -our ($PLUGIN_KITNAME); -#$PLUGIN_KITNAME = "TESTMODE"; -$PLUGIN_KITNAME = "<<>>"; - - -#------------------------------------------------------- - -=head1 - - Image Profile Kit Plugin - This plugin contains commands to run custom actions - during image profile operations. - -=cut - -#------------------------------------------------------- - - -#------------------------------------------------------- - -=head3 handled_commands - - Return list of kit plugin commands handled by this plugin - -=cut - -#------------------------------------------------------- - -sub handled_commands { - return { - kitimagevalidatecomps => '<<>>_imageprofile', - kitimageimport => '<<>>_imageprofile', - }; -} - - -#------------------------------------------------------- - -=head3 process_request - - Process the kit plugin command. - -=cut - -#------------------------------------------------------- - -sub process_request { - my $request = shift; - my $callback = shift; - - # This kit plugin is passed the name of an image profile. - # We need to determine which kits is used by this - # image profile to decide if this plugin should run or not. - - my $imgprofilename = $request->{arg}->[0]; - - my $kitdata = $request->{kitdata}; - if (! defined($kitdata)) { - $kitdata = xCAT::KitPluginUtils->get_kits_used_by_image_profiles([$imgprofilename]); - $request->{kitdata} = $kitdata; - } - - if ($PLUGIN_KITNAME ne "TESTMODE" && ! exists($kitdata->{$PLUGIN_KITNAME})) { - return; - } - - # Name of command and node list - my $command = $request->{command}->[0]; - my $args = $request->{arg}; - - if($command eq 'kitimagevalidatecomps') { - kitimagevalidatecomps($callback, $args); - } - elsif ($command eq 'kitimageimport') { - kitimageimport($callback, $args); - - } else { - my $rsp; - $rsp->{data}->[0] = "Command is not supported"; - xCAT::MsgUtils->message("E", $rsp, $callback); - } -} - - -#------------------------------------------------------- - -=head3 kitimagevalidatecomps - - This command is called to validate new changes to an - image profile's kit component list before the changes - are committed. - -=cut - -#------------------------------------------------------- - -sub kitimagevalidatecomps { - my $callback = shift; - my $args = shift; - my $rsp; - - # Parameters - my $imgprofilename = $args->[0]; - my $newcomplist = $args->[1]; - my @newcomplist = (); - if (defined($newcomplist)) { - @newcomplist = split(/,/, $newcomplist); - } - my $newosdistro = $args->[2]; - my $newosdistroupdate = $args->[3]; - - $rsp->{data}->[0] = "Running kitimagevalidatecomps"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitimageimport - - This command is called after changes to an image profile - have been committed. - -=cut - -#------------------------------------------------------- - -sub kitimageimport { - my $callback = shift; - my $args = shift; - my $rsp; - - # Parameters - my $imgprofilename = $args->[0]; - - $rsp->{data}->[0] = "Running kitimageimport"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-ppc64/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-ppc64/plugins/sample/nodemgmt.pm deleted file mode 100644 index 1eb766eb7..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-ppc64/plugins/sample/nodemgmt.pm +++ /dev/null @@ -1,251 +0,0 @@ -package xCAT_plugin::<<>>_nodemgmt; - -use strict; -use warnings; - -require xCAT::Utils; -require xCAT::Table; -require xCAT::KitPluginUtils; - -# buildkit Processing -# In order to avoid collisions with other plugins, the package -# name for this plugin must contain the full kit name. -# The buildkit buildtar command will copy this file from your plugins -# directory to the the kit build directory, renaming the file with the -# correct kit name. All strings in this file of the form -# <<>> -# will be replaced with the full kit name. In order for buildkit to -# correctly edit this file, do not remove these strings. - -# Global Variables - -# This is the full name of the kit which this plugin belongs -# to. The kit name is used by some code in process_request() -# to determine if the plugin should run. When you are testing -# your plugin the kit name should be set to "TESTMODE" to -# bypass the plugin check in process_request(). - -our ($PLUGIN_KITNAME); -#$PLUGIN_KITNAME = "TESTMODE"; -$PLUGIN_KITNAME = "<<>>"; - - -#------------------------------------------------------- - -=head1 - - Node Management Kit Plugin - This plugin contains commands to run custom actions - during node management operations. - -=cut - -#------------------------------------------------------- - - -#------------------------------------------------------- - -=head3 handled_commands - - Return list of kit plugin commands handled by this plugin - -=cut - -#------------------------------------------------------- - -sub handled_commands { - return { - kitnodeadd => '<<>>_nodemgmt', - kitnoderemove => '<<>>_nodemgmt', - kitnodeupdate => '<<>>_nodemgmt', - kitnoderefresh => '<<>>_nodemgmt', - kitnodefinished => '<<>>_nodemgmt', - }; -} - - -#------------------------------------------------------- - -=head3 process_request - - Process the kit plugin command. - -=cut - -#------------------------------------------------------- - -sub process_request { - my $request = shift; - my $callback = shift; - - # Name of command and node list - my $command = $request->{command}->[0]; - my $nodes = $request->{node}; - - # This kit plugin is passed a list of node names. - # We need to determine which kits are used by these - # nodes to decide if this plugin should run or not. - - my $kitdata = $request->{kitdata}; - if (! defined($kitdata)) { - $kitdata = xCAT::KitPluginUtils->get_kits_used_by_nodes($nodes); - $request->{kitdata} = $kitdata; - } - - if ($PLUGIN_KITNAME ne "TESTMODE" && ! exists($kitdata->{$PLUGIN_KITNAME})) { - return; - } - - # Get the nodes using this plugin's kit - $nodes = $kitdata->{$PLUGIN_KITNAME}; - - - if($command eq 'kitnodeadd') { - kitnodeadd($callback, $nodes); - } - elsif ($command eq 'kitnoderemove') { - kitnoderemove($callback, $nodes); - } - elsif ($command eq 'kitnodeupdate') { - kitnodeupdate($callback, $nodes); - } - elsif ($command eq 'kitnoderefresh') { - kitnoderefresh($callback, $nodes); - } - elsif ($command eq 'kitnodefinished') { - kitnodefinished($callback); - - } else { - my $rsp; - $rsp->{data}->[0] = "Command is not supported"; - xCAT::MsgUtils->message("E", $rsp, $callback); - } -} - - -#------------------------------------------------------- - -=head3 kitnodeadd - - This command is called when one or more nodes are added - to the cluster. - -=cut - -#------------------------------------------------------- - -sub kitnodeadd { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnodeadd"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnoderemove - - This command is called when one or more nodes are - removed from the cluster. - -=cut - -#------------------------------------------------------- - -sub kitnoderemove { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnoderemove"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnodeupdate - - This command is called when the configuration of one - or more nodes are updated. - -=cut - -#------------------------------------------------------- - -sub kitnodeupdate { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnodeupdate"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnoderefresh - - This command is called when node-related configuration - files are updated. - -=cut - -#------------------------------------------------------- - -sub kitnoderefresh { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnoderefresh"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnodefinished - - This command is called at the end of a node management - operation. - -=cut - -#------------------------------------------------------- - -sub kitnodefinished { - my $callback = shift; - my $rsp; - - $rsp->{data}->[0] = "Running kitnodefinished"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-x86_64/plugins/sample/imageprofile.pm b/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-x86_64/plugins/sample/imageprofile.pm deleted file mode 100644 index f42b70e7f..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-x86_64/plugins/sample/imageprofile.pm +++ /dev/null @@ -1,175 +0,0 @@ -package xCAT_plugin::<<>>_imageprofile; - -use strict; -use warnings; - -require xCAT::Utils; -require xCAT::Table; -require xCAT::KitPluginUtils; - - -# buildkit Processing -# In order to avoid collisions with other plugins, the package -# name for this plugin must contain the full kit name. -# The buildkit buildtar command will copy this file from your plugins -# directory to the the kit build directory, renaming the file with the -# correct kit name. All strings in this file of the form -# <<>> -# will be replaced with the full kit name. In order for buildkit to -# correctly edit this file, do not remove these strings. - - -# Global Variables - -# This is the full name of the kit which this plugin belongs -# to. The kit name is used by some code in process_request() -# to determine if the plugin should run. When you are testing -# your plugin the kit name should be set to "TESTMODE" to -# bypass the plugin check in process_request(). - -our ($PLUGIN_KITNAME); -#$PLUGIN_KITNAME = "TESTMODE"; -$PLUGIN_KITNAME = "<<>>"; - - -#------------------------------------------------------- - -=head1 - - Image Profile Kit Plugin - This plugin contains commands to run custom actions - during image profile operations. - -=cut - -#------------------------------------------------------- - - -#------------------------------------------------------- - -=head3 handled_commands - - Return list of kit plugin commands handled by this plugin - -=cut - -#------------------------------------------------------- - -sub handled_commands { - return { - kitimagevalidatecomps => '<<>>_imageprofile', - kitimageimport => '<<>>_imageprofile', - }; -} - - -#------------------------------------------------------- - -=head3 process_request - - Process the kit plugin command. - -=cut - -#------------------------------------------------------- - -sub process_request { - my $request = shift; - my $callback = shift; - - # This kit plugin is passed the name of an image profile. - # We need to determine which kits is used by this - # image profile to decide if this plugin should run or not. - - my $imgprofilename = $request->{arg}->[0]; - - my $kitdata = $request->{kitdata}; - if (! defined($kitdata)) { - $kitdata = xCAT::KitPluginUtils->get_kits_used_by_image_profiles([$imgprofilename]); - $request->{kitdata} = $kitdata; - } - - if ($PLUGIN_KITNAME ne "TESTMODE" && ! exists($kitdata->{$PLUGIN_KITNAME})) { - return; - } - - # Name of command and node list - my $command = $request->{command}->[0]; - my $args = $request->{arg}; - - if($command eq 'kitimagevalidatecomps') { - kitimagevalidatecomps($callback, $args); - } - elsif ($command eq 'kitimageimport') { - kitimageimport($callback, $args); - - } else { - my $rsp; - $rsp->{data}->[0] = "Command is not supported"; - xCAT::MsgUtils->message("E", $rsp, $callback); - } -} - - -#------------------------------------------------------- - -=head3 kitimagevalidatecomps - - This command is called to validate new changes to an - image profile's kit component list before the changes - are committed. - -=cut - -#------------------------------------------------------- - -sub kitimagevalidatecomps { - my $callback = shift; - my $args = shift; - my $rsp; - - # Parameters - my $imgprofilename = $args->[0]; - my $newcomplist = $args->[1]; - my @newcomplist = (); - if (defined($newcomplist)) { - @newcomplist = split(/,/, $newcomplist); - } - my $newosdistro = $args->[2]; - my $newosdistroupdate = $args->[3]; - - $rsp->{data}->[0] = "Running kitimagevalidatecomps"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitimageimport - - This command is called after changes to an image profile - have been committed. - -=cut - -#------------------------------------------------------- - -sub kitimageimport { - my $callback = shift; - my $args = shift; - my $rsp; - - # Parameters - my $imgprofilename = $args->[0]; - - $rsp->{data}->[0] = "Running kitimageimport"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-x86_64/plugins/sample/nodemgmt.pm b/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-x86_64/plugins/sample/nodemgmt.pm deleted file mode 100644 index 1eb766eb7..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/teal-x86_64/plugins/sample/nodemgmt.pm +++ /dev/null @@ -1,251 +0,0 @@ -package xCAT_plugin::<<>>_nodemgmt; - -use strict; -use warnings; - -require xCAT::Utils; -require xCAT::Table; -require xCAT::KitPluginUtils; - -# buildkit Processing -# In order to avoid collisions with other plugins, the package -# name for this plugin must contain the full kit name. -# The buildkit buildtar command will copy this file from your plugins -# directory to the the kit build directory, renaming the file with the -# correct kit name. All strings in this file of the form -# <<>> -# will be replaced with the full kit name. In order for buildkit to -# correctly edit this file, do not remove these strings. - -# Global Variables - -# This is the full name of the kit which this plugin belongs -# to. The kit name is used by some code in process_request() -# to determine if the plugin should run. When you are testing -# your plugin the kit name should be set to "TESTMODE" to -# bypass the plugin check in process_request(). - -our ($PLUGIN_KITNAME); -#$PLUGIN_KITNAME = "TESTMODE"; -$PLUGIN_KITNAME = "<<>>"; - - -#------------------------------------------------------- - -=head1 - - Node Management Kit Plugin - This plugin contains commands to run custom actions - during node management operations. - -=cut - -#------------------------------------------------------- - - -#------------------------------------------------------- - -=head3 handled_commands - - Return list of kit plugin commands handled by this plugin - -=cut - -#------------------------------------------------------- - -sub handled_commands { - return { - kitnodeadd => '<<>>_nodemgmt', - kitnoderemove => '<<>>_nodemgmt', - kitnodeupdate => '<<>>_nodemgmt', - kitnoderefresh => '<<>>_nodemgmt', - kitnodefinished => '<<>>_nodemgmt', - }; -} - - -#------------------------------------------------------- - -=head3 process_request - - Process the kit plugin command. - -=cut - -#------------------------------------------------------- - -sub process_request { - my $request = shift; - my $callback = shift; - - # Name of command and node list - my $command = $request->{command}->[0]; - my $nodes = $request->{node}; - - # This kit plugin is passed a list of node names. - # We need to determine which kits are used by these - # nodes to decide if this plugin should run or not. - - my $kitdata = $request->{kitdata}; - if (! defined($kitdata)) { - $kitdata = xCAT::KitPluginUtils->get_kits_used_by_nodes($nodes); - $request->{kitdata} = $kitdata; - } - - if ($PLUGIN_KITNAME ne "TESTMODE" && ! exists($kitdata->{$PLUGIN_KITNAME})) { - return; - } - - # Get the nodes using this plugin's kit - $nodes = $kitdata->{$PLUGIN_KITNAME}; - - - if($command eq 'kitnodeadd') { - kitnodeadd($callback, $nodes); - } - elsif ($command eq 'kitnoderemove') { - kitnoderemove($callback, $nodes); - } - elsif ($command eq 'kitnodeupdate') { - kitnodeupdate($callback, $nodes); - } - elsif ($command eq 'kitnoderefresh') { - kitnoderefresh($callback, $nodes); - } - elsif ($command eq 'kitnodefinished') { - kitnodefinished($callback); - - } else { - my $rsp; - $rsp->{data}->[0] = "Command is not supported"; - xCAT::MsgUtils->message("E", $rsp, $callback); - } -} - - -#------------------------------------------------------- - -=head3 kitnodeadd - - This command is called when one or more nodes are added - to the cluster. - -=cut - -#------------------------------------------------------- - -sub kitnodeadd { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnodeadd"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnoderemove - - This command is called when one or more nodes are - removed from the cluster. - -=cut - -#------------------------------------------------------- - -sub kitnoderemove { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnoderemove"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnodeupdate - - This command is called when the configuration of one - or more nodes are updated. - -=cut - -#------------------------------------------------------- - -sub kitnodeupdate { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnodeupdate"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnoderefresh - - This command is called when node-related configuration - files are updated. - -=cut - -#------------------------------------------------------- - -sub kitnoderefresh { - my $callback = shift; - my $rsp; - - # Parameters - my $nodes = shift; - - $rsp->{data}->[0] = "Running kitnoderefresh"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - - -#------------------------------------------------------- - -=head3 kitnodefinished - - This command is called at the end of a node management - operation. - -=cut - -#------------------------------------------------------- - -sub kitnodefinished { - my $callback = shift; - my $rsp; - - $rsp->{data}->[0] = "Running kitnodefinished"; - xCAT::MsgUtils->message("I", $rsp, $callback); - - # TODO - # ... ADD YOUR CODE HERE -} - diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/template/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/template/buildkit.conf index 1e0bf0d8c..c40d9d9c4 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/template/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/template/buildkit.conf @@ -20,12 +20,15 @@ # kitdeployparams (optional) Filename containing a list of kit deployment # parameters, relative to # /other_files +# kitlicense (mandatory) Kit license string to be built into all +# kitcomponent packages kit: basename=template description=description for template version=1.0 ostype=Linux kitdeployparams=sample/kitdeployparams.lst + kitlicense=EPL # kitrepo: This section defines a Kit Package Repository. @@ -46,11 +49,11 @@ kit: # OS distro base names. e.g., centos kitrepo: - kitrepoid=rhels6.3 + kitrepoid=rhels6.2 osbasename=rhels osmajorversion=6 - osminorversion=3 - osarch=x86_64 + osminorversion=2 + osarch=ppc64 #compat_osbasenames= @@ -105,14 +108,15 @@ kitrepo: # script path relative to /scripts # Script attributes: # preinstall, postinstall, preuninstall, postuninstall, -# preupgrade, postupgrade, postbootscripts +# preupgrade, postupgrade, postbootscripts, +# genimage_postinstall kitcomponent: basename=template_compute description=description for component template_compute version=1.0 release=1 serverroles=compute - kitrepoid=rhels6.3 + kitrepoid=rhels6.2 #kitcompdeps= #ospkgdeps= kitpkgdeps=pkg1 @@ -127,6 +131,7 @@ kitcomponent: preupgrade=sample/preup.sh postupgrade=sample/postup.sh postbootscripts=sample/postboot.sh + genimage_postinstall=sample/genimage_post.sh # kitpackage: This section defines one Kit Package, and how to build it. @@ -177,28 +182,28 @@ kitcomponent: # rpm_srpm: Path to source RPM package. kitpackage: filename=pkg1-1-1.noarch.rpm - kitrepoid=rhels6.3 + kitrepoid=rhels6.2 # Method 1: Use pre-built RPM package isexternalpkg=no rpm_prebuiltdir=sample/pkg1 #kitpackage: # filename=pkg2-1-1.noarch.rpm -# kitrepoid=rhels6.3 +# kitrepoid=rhels6.2 # # Method 2: Build RPM from spec + src dir # rpm_spec=sample/pkg2/pkg2.spec # rpm_srcdir=sample/pkg2/pkg2 # #kitpackage: # filename=pkg3-1-1.noarch.rpm -# kitrepoid=rhels6.3 +# kitrepoid=rhels6.2 # # Method 3: Build RPM from spec + src tarball # rpm_spec=sample/pkg3/pkg3.spec # rpm_srctarball=sample/pkg3/pkg3.tar.gz # #kitpackage: # filename=pkg4-1-1.noarch.rpm -# kitrepoid=rhels6.3 +# kitrepoid=rhels6.2 # # Method 4: Build RPM from source RPM # rpm_srpm=sample/pkg4/pkg4-1-1.src.rpm # diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/template/source_packages/sample/pkg1/pkg1-1-1.noarch.rpm b/xCAT-buildkit/share/xcat/kits/kit_build/template/source_packages/sample/pkg1/pkg1-1-1.noarch.rpm index 8bffe202d..f2f995a49 100644 Binary files a/xCAT-buildkit/share/xcat/kits/kit_build/template/source_packages/sample/pkg1/pkg1-1-1.noarch.rpm and b/xCAT-buildkit/share/xcat/kits/kit_build/template/source_packages/sample/pkg1/pkg1-1-1.noarch.rpm differ diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/template/source_packages/sample/pkg4/pkg4-1-1.src.rpm b/xCAT-buildkit/share/xcat/kits/kit_build/template/source_packages/sample/pkg4/pkg4-1-1.src.rpm index 8833a5c55..c2ef074ca 100644 Binary files a/xCAT-buildkit/share/xcat/kits/kit_build/template/source_packages/sample/pkg4/pkg4-1-1.src.rpm and b/xCAT-buildkit/share/xcat/kits/kit_build/template/source_packages/sample/pkg4/pkg4-1-1.src.rpm differ