diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/buildkit.conf index da5d85a03..a4c36ec99 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/buildkit.conf @@ -23,8 +23,10 @@ kit: basename=gpfs description=General Parallel File System - version=3.5.0-9 + version=3.5.0 + release=9 ostype=Linux + osarch=x86_64 kitlicense=ILAN #kitdeployparams= @@ -114,130 +116,114 @@ kitrepo: kitcomponent: basename=gpfs_compute description=GPFS for compute nodes - version=3.5.0 - release=9 serverroles=compute,servicenode kitrepoid=rhels6_x86_64 #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 + kitpkgdeps=gpfs.libsrc,gpfs.src,gpfs.base,gpfs.gpl,gpfs.msg.en_US,gpfs.docs #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-9.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-*.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes - version=3.5.0 - release=9 serverroles=compute,servicenode kitrepoid=rhels6_x86_64 #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 + kitpkgdeps=gpfs.libsrc,gpfs.src,gpfs.base,gpfs.gpl,gpfs.msg.en_US #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-9.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-*.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_login description=GPFS for login nodes - version=3.5.0 - release=9 serverroles=login kitrepoid=rhels6_x86_64 #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 + kitpkgdeps=gpfs.libsrc,gpfs.src,gpfs.base,gpfs.gpl,gpfs.msg.en_US,gpfs.docs #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-9.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-*.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storage description=GPFS for storage nodes - version=3.5.0 - release=9 serverroles=storage,servicenode kitrepoid=rhels6_x86_64 #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 + kitpkgdeps=gpfs.libsrc,gpfs.src,gpfs.base,gpfs.gpl,gpfs.msg.en_US,gpfs.docs #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-9.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-*.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_compute description=GPFS for compute nodes - version=3.5.0 - release=9 serverroles=compute,servicenode kitrepoid=sles11_x86_64 #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 + kitpkgdeps=gpfs.libsrc,gpfs.src,gpfs.base,gpfs.gpl,gpfs.msg.en_US,gpfs.docs #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-9.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-*.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=min_gpfs_compute description=Minimal GPFS for compute nodes - version=3.5.0 - release=9 serverroles=compute,servicenode kitrepoid=sles11_x86_64 #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 + kitpkgdeps=gpfs.libsrc,gpfs.src,gpfs.base,gpfs.gpl,gpfs.msg.en_US #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-9.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-*.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_login description=GPFS for login nodes - version=3.5.0 - release=9 serverroles=login kitrepoid=sles11_x86_64 #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 + kitpkgdeps=gpfs.libsrc,gpfs.src,gpfs.base,gpfs.gpl,gpfs.msg.en_US,gpfs.docs #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-9.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-*.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* kitcomponent: basename=gpfs_storage description=GPFS for storage nodes - version=3.5.0 - release=9 serverroles=storage,servicenode kitrepoid=sles11_x86_64 #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 + kitpkgdeps=gpfs.libsrc,gpfs.src,gpfs.base,gpfs.gpl,gpfs.msg.en_US,gpfs.docs #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-9.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* + genimage_postinstall=gpfs_update + non_native_pkgs=EXTERNALPKGS:gpfs.base-*.x86_64.update.rpm,EXTERNALPKGS:gpfs.gplbin* @@ -288,42 +274,42 @@ kitcomponent: # 4. Build RPM from source RPM # rpm_srpm: Path to source RPM package. kitpackage: - filename=gpfs.base-3.5.0-9.x86_64.rpm + filename=gpfs.base-*.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=gpfs.gpl-3.5.0-9.noarch.rpm + filename=gpfs.gpl-*.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=gpfs.docs-3.5.0-9.noarch.rpm + filename=gpfs.docs-*.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=gpfs.msg.en_US-3.5.0-9.noarch.rpm + filename=gpfs.msg.en_US-*.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=gpfs.src-3.5.0-9.noarch.rpm + filename=gpfs.src-*.noarch.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=gpfs.libsrc-3.5.0-9.noarch.rpm + filename=gpfs.libsrc-*.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-9-Linux-x86_64/scripts/gpfs_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/gpfs_update new file mode 100644 index 000000000..1900f8e0e --- /dev/null +++ b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/gpfs_update @@ -0,0 +1,16 @@ +#!/bin/sh + + +rpmdir="/opt/xcat/kits/<<>>/<<>>" + +if [[ ! -z "$installroot" ]]; then + if [ -n "`ls $installroot$rpmdir/*.rpm 2> /dev/null`" ] ; then + rpm --force --root $installroot -Uvh $installroot$rpmdir/*.rpm + fi +else + if [ -n "`ls $rpmdir/*.rpm 2> /dev/null`" ] ; then + rpm --force -Uvh $rpmdir/*.rpm + fi +fi + +exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/rhels_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/rhels_gpfs_compute_update deleted file mode 100644 index 3beb6fb91..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/rhels_gpfs_compute_update +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [[ ! -z "$installroot" ]]; then - if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-9-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-9-rhels-6-x86_64/*.rpm - fi -else - if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-9-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-9-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-9-Linux-x86_64/scripts/rhels_gpfs_login_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/rhels_gpfs_login_update deleted file mode 100644 index d6aa412fc..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/rhels_gpfs_login_update +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [[ ! -z "$installroot" ]]; then - if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-9-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-9-rhels-6-x86_64/*.rpm - fi -else - if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_login-3.5.0-9-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_login-3.5.0-9-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-9-Linux-x86_64/scripts/rhels_gpfs_storage_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/rhels_gpfs_storage_update deleted file mode 100644 index 1c68efb77..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/rhels_gpfs_storage_update +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [[ ! -z "$installroot" ]]; then - if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-9-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-9-rhels-6-x86_64/*.rpm - fi -else - if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-9-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-9-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-9-Linux-x86_64/scripts/rhels_min_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/rhels_min_gpfs_compute_update deleted file mode 100644 index 333f5b29b..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/rhels_min_gpfs_compute_update +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [[ ! -z "$installroot" ]]; then - if [ -n "`ls $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-9-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-9-rhels-6-x86_64/*.rpm - fi -else - if [ -n "`ls /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-9-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force -Uvh /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-9-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-9-Linux-x86_64/scripts/sles_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/sles_gpfs_compute_update deleted file mode 100644 index 9e3c76109..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/sles_gpfs_compute_update +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [[ ! -z "$installroot" ]]; then - if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-9-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_compute-3.5.0-9-sles-11-x86_64/*.rpm - fi -else - if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-9-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_compute-3.5.0-9-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-9-Linux-x86_64/scripts/sles_gpfs_login_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/sles_gpfs_login_update deleted file mode 100644 index 457aed33f..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/sles_gpfs_login_update +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [[ ! -z "$installroot" ]]; then - if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-9-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_login-3.5.0-9-sles-11-x86_64/*.rpm - fi -else - if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_login-3.5.0-9-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_login-3.5.0-9-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-9-Linux-x86_64/scripts/sles_gpfs_storage_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/sles_gpfs_storage_update deleted file mode 100644 index e60f2f417..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/sles_gpfs_storage_update +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [[ ! -z "$installroot" ]]; then - if [ -n "`ls $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-9-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force --root $installroot -Uvh $installroot/opt/xcat/kits/gpfs/gpfs_storage-3.5.0-9-sles-11-x86_64/*.rpm - fi -else - if [ -n "`ls /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-9-sles-11-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force -Uvh /opt/xcat/kits/gpfs/gpfs_storage-3.5.0-9-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-9-Linux-x86_64/scripts/sles_min_gpfs_compute_update b/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/sles_min_gpfs_compute_update deleted file mode 100644 index 333f5b29b..000000000 --- a/xCAT-buildkit/share/xcat/kits/kit_build/gpfs/partial-gpfs-3.5.0-9-Linux-x86_64/scripts/sles_min_gpfs_compute_update +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [[ ! -z "$installroot" ]]; then - if [ -n "`ls $installroot/opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-9-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-9-rhels-6-x86_64/*.rpm - fi -else - if [ -n "`ls /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-9-rhels-6-x86_64/*.rpm 2> /dev/null`" ] ; then - rpm --force -Uvh /opt/xcat/kits/gpfs/min_gpfs_compute-3.5.0-9-rhels-6-x86_64/*.rpm - fi -fi - -exit 0 diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.2-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.2-x86_64/buildkit.conf index 46cca73e5..649aa0806 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.2-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppe/partial-pperte-1.3.0.2-x86_64/buildkit.conf @@ -29,7 +29,9 @@ kit: basename=pperte description=Parallel Environment Runtime Edition version=1.3.0.2 + release=0 ostype=Linux + osarch=x86_64 kitlicense=ILAN kitdeployparams=pe.env @@ -113,13 +115,11 @@ kitrepo: kitcomponent: basename=pperte_compute description=PE RTE for compute nodes - version=1.3.0.2 - release=0 serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= ospkgdeps=yum,at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.2,pperteman >= 1.3.0.2,ppertesamples >= 1.3.0.2,src + kitpkgdeps=ppe_rte_license,pperte,pperteman,ppertesamples,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -128,13 +128,11 @@ kitcomponent: kitcomponent: basename=min_pperte_compute description=Minimal PE RTE for compute nodes - version=1.3.0.2 - release=0 serverroles=compute kitrepoid=rhels6_x86_64 #kitcompdeps= ospkgdeps=yum,at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.2,src + kitpkgdeps=ppe_rte_license,pperte,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -143,13 +141,11 @@ kitcomponent: kitcomponent: basename=pperte_login description=PE RTE for login nodes - version=1.3.0.2 - release=0 serverroles=login kitrepoid=rhels6_x86_64 #kitcompdeps= ospkgdeps=yum,at,rsh,rsh-server,xinetd,sudo,libibverbs(x86-32),libibverbs(x86-64) - kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.2,pperteman >= 1.3.0.2,ppertesamples >= 1.3.0.2,src + kitpkgdeps=ppe_rte_license,pperte,pperteman,ppertesamples,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -159,13 +155,11 @@ kitcomponent: kitcomponent: basename=pperte_compute description=PE RTE for compute nodes - version=1.3.0.2 - release=0 serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs - kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.2,pperteman >= 1.3.0.2,ppertesamples >= 1.3.0.2,src + kitpkgdeps=ppe_rte_license,pperte,pperteman,ppertesamples,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -174,13 +168,11 @@ kitcomponent: kitcomponent: basename=min_pperte_compute description=Minimal PE RTE for compute nodes - version=1.3.0.2 - release=0 serverroles=compute kitrepoid=sles11_x86_64 #kitcompdeps= ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs - kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.2,src + kitpkgdeps=ppe_rte_license,pperte,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -189,13 +181,11 @@ kitcomponent: kitcomponent: basename=pperte_login description=PE RTE for login nodes - version=1.3.0.2 - release=0 serverroles=login kitrepoid=sles11_x86_64 #kitcompdeps= ospkgdeps=zypper,at,rsh-server,xinetd,sudo,libibverbs-32bit,libibverbs - kitpkgdeps=ppe_rte_license,pperte >= 1.3.0.2,pperteman >= 1.3.0.2,ppertesamples >= 1.3.0.2,src + kitpkgdeps=ppe_rte_license,pperte,pperteman,ppertesamples,src exlist=pe.exlist postinstall=pperte_postinstall postupgrade=pperte_postinstall @@ -250,42 +240,42 @@ kitcomponent: ### RH6 x86_64 rpms kitpackage: - filename=pperte-1.3.0.2-*.x86_64.rpm + filename=pperte-*.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=pperteman-1.3.0.2-*.x86_64.rpm + filename=pperteman-*.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppertesamples-1.3.0.2-*.x86_64.rpm + filename=ppertesamples-*.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppe_rte_1302-1.3.0.2-*.x86_64.rpm + filename=ppe_rte_*.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppe_rte_man-1.3.0.2-*.x86_64.rpm + filename=ppe_rte_man-*.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=ppe_rte_samples-1.3.0.2-*.x86_64.rpm + filename=ppe_rte_samples-*.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes @@ -301,7 +291,7 @@ kitpackage: ### License rpm gets placed in all repos kitpackage: - filename=ppe_rte_license-1.3.0.0-*.x86_64.rpm + filename=ppe_rte_license-*.x86_64.rpm kitrepoid=rhels6_x86_64,sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-2-x86_64-RHEL6/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-2-x86_64-RHEL6/buildkit.conf index 451c683e8..aaa9f081b 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-2-x86_64-RHEL6/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-2-x86_64-RHEL6/buildkit.conf @@ -26,6 +26,8 @@ kit: version=1.2.0 release=2 ostype=Linux + osbasename=rhels + osarch=x86_64 kitlicense=ILAN kitdeployparams=ppedev.env diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-2-x86_64-SLES11/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-2-x86_64-SLES11/buildkit.conf index 9523ce64f..d48bf0c64 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-2-x86_64-SLES11/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/ppedev/partial-ppedev-1.2.0-2-x86_64-SLES11/buildkit.conf @@ -26,6 +26,8 @@ kit: version=1.2.0 release=2 ostype=Linux + osbasename=sles + osarch=x86_64 kitlicense=ILAN kitdeployparams=ppedev.env diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf index 11f9b652b..ca85cdf52 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-rhel-1.2.0-2-x86_64/buildkit.conf @@ -21,11 +21,13 @@ # parameters, relative to # /other_files kit: - basename=teal-rhel + basename=teal description=teal for Linux version=1.2.0.2 release=1 ostype=Linux + osbasename=rhels + osarch=x86_64 kitlicense=ILAN # kitdeployparams= @@ -108,90 +110,72 @@ kitrepo: kitcomponent: basename=teal-base description=teal for management nodes - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-base >= 1.2.0.2 + kitpkgdeps=teal-base kitcomponent: basename=teal-gpfs description=teal for gpfs - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=rhels6_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-gpfs >= 1.2.0.2,teal-gpfs-sn >= 1.2.0.2 + kitpkgdeps=teal-gpfs,teal-gpfs-sn kitcomponent: basename=teal-ib description=teal for ib - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=rhels6_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-ib >= 1.2.0.2 + kitpkgdeps=teal-ib kitcomponent: basename=teal-isnm description=teal for isnm - version=1.2.0.1 - release=1 serverroles=mgtnode kitrepoid=rhels6_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-isnm >= 1.2.0.1 + kitpkgdeps=teal-isnm kitcomponent: basename=teal-ll description=teal for pnsd - version=1.2.0.0 - release=1 serverroles=mgtnode kitrepoid=rhels6_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-isnm >= 1.2.0.0 + kitpkgdeps=teal-isnm kitcomponent: basename=teal-pnsd description=teal for pnsd - version=1.2.0.0 - release=1 serverroles=mgtnode kitrepoid=rhels6_x86_64 - kitpkgdeps=teal-pnsd >= 1.2.0.0 + kitpkgdeps=teal-pnsd kitcomponent: basename=teal-sfp description=teal for sfp - version=1.2.0.0 - release=1 serverroles=mgtnode kitrepoid=rhels6_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-sfp >= 1.2.0.0 + kitpkgdeps=teal-sfp kitcomponent: basename=teal-syslog description=teal for syslog - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=rhels6_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-syslog >= 1.2.0.2 + kitpkgdeps=teal-syslog kitcomponent: basename=teal-test description=teal test - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=rhels6_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-test >= 1.2.0.2 + kitpkgdeps=teal-test # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. @@ -240,64 +224,64 @@ kitcomponent: # 4. Build RPM from source RPM # rpm_srpm: Path to source RPM package. kitpackage: - filename=teal-base-1.2.0.2-*.x86_64.rpm + filename=teal-base-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-gpfs-1.2.0.2-*.x86_64.rpm + filename=teal-gpfs-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-gpfs-sn-1.2.0.2-*.x86_64.rpm + filename=teal-gpfs-sn-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-ib-1.2.0.2-*.x86_64.rpm + filename=teal-ib-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-isnm-1.2.0.1-*.x86_64.rpm + filename=teal-isnm-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-ll-1.2.0.0-*.x86_64.rpm + filename=teal-ll-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-pnsd-1.2.0.0-*.x86_64.rpm + filename=teal-pnsd-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-sfp-1.2.0.0-*.x86_64.rpm + filename=teal-sfp-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-syslog-1.2.0.2-*.x86_64.rpm + filename=teal-syslog-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-test-1.2.0.2-*.x86_64.rpm + filename=teal-test-1.2.0*.x86_64.rpm kitrepoid=rhels6_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf index 3bf872bb4..fd422f648 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/teal/partial-teal-sles-1.2.0-2-x86_64/buildkit.conf @@ -21,11 +21,13 @@ # parameters, relative to # /other_files kit: - basename=teal-sles + basename=teal description=teal for Linux version=1.2.0.2 release=1 ostype=Linux + osbasename=sles + osarch=x86_64 kitlicense=ILAN # kitdeployparams= @@ -108,92 +110,74 @@ kitrepo: kitcomponent: basename=teal-base description=teal for management nodes - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=sles11_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-base >= 1.2.0.2 + kitpkgdeps=teal-base kitcomponent: basename=teal-gpfs description=teal for gpfs - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=sles11_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-gpfs >= 1.2.0.2,teal-gpfs-sn >= 1.2.0.2 + kitpkgdeps=teal-gpfs,teal-gpfs-sn kitcomponent: basename=teal-ib description=teal for ib - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=sles11_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-ib >= 1.2.0.2 + kitpkgdeps=teal-ib kitcomponent: basename=teal-isnm description=teal for isnm - version=1.2.0.1 - release=1 serverroles=mgtnode kitrepoid=sles11_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-isnm >= 1.2.0.1 + kitpkgdeps=teal-isnm kitcomponent: basename=teal-ll description=teal for pnsd - version=1.2.0.0 - release=1 serverroles=mgtnode kitrepoid=sles11_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-isnm >= 1.2.0.0 + kitpkgdeps=teal-isnm kitcomponent: basename=teal-pnsd description=teal for pnsd - version=1.2.0.0 - release=1 serverroles=mgtnode kitrepoid=sles11_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-pnsd >= 1.2.0.0 + kitpkgdeps=teal-pnsd kitcomponent: basename=teal-sfp description=teal for sfp - version=1.2.0.0 - release=1 serverroles=mgtnode kitrepoid=sles11_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-sfp >= 1.2.0.0 + kitpkgdeps=teal-sfp kitcomponent: basename=teal-syslog description=teal for syslog - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=sles11_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-syslog >= 1.2.0.2 + kitpkgdeps=teal-syslog kitcomponent: basename=teal-test description=teal test - version=1.2.0.2 - release=1 serverroles=mgtnode kitrepoid=sles11_x86_64 kitcompdeps=teal-base - kitpkgdeps=teal-test >= 1.2.0.2 + kitpkgdeps=teal-test # kitpackage: This section defines one Kit Package, and how to build it. # There can be zero or more kitpackage sections. @@ -242,64 +226,64 @@ kitcomponent: # 4. Build RPM from source RPM # rpm_srpm: Path to source RPM package. kitpackage: - filename=teal-base-1.2.0.2-*.x86_64.rpm + filename=teal-base-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-gpfs-1.2.0.2-*.x86_64.rpm + filename=teal-gpfs-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-gpfs-sn-1.2.0.2-*.x86_64.rpm + filename=teal-gpfs-sn-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-ib-1.2.0.2-*.x86_64.rpm + filename=teal-ib-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-isnm-1.2.0.1-*.x86_64.rpm + filename=teal-isnm-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-ll-1.2.0.0-*.x86_64.rpm + filename=teal-ll-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-pnsd-1.2.0.0-*.x86_64.rpm + filename=teal-pnsd-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-sfp-1.2.0.0-*.x86_64.rpm + filename=teal-sfp-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-syslog-1.2.0.2-*.x86_64.rpm + filename=teal-syslog-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes kitpackage: - filename=teal-test-1.2.0.2-*.x86_64.rpm + filename=teal-test-1.2.0*.x86_64.rpm kitrepoid=sles11_x86_64 # Method 1: Use pre-built RPM package isexternalpkg=yes