From 317a2adcf754e268b268a6059e220618b723d6ec Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf --- .../xcat/kits/kit_template/buildkit.conf | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf index edeeb644b..f38c68be2 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf @@ -1,8 +1,8 @@ # Kit Build File -# +# # A unique version of this file is automatically generated for a new Kit -# when you run the buildkit command to create a new Kit. The basic template -# for this file is contained in the /opt/xcat/share/xcat/kits/kit_template +# when you run the buildkit command to create a new Kit. The basic template +# for this file is contained in the /opt/xcat/share/xcat/kits/kit_template # directory. Once the initial version of this file is generated you will # have to modify it by adding the details needed to build your new Kit. # @@ -48,9 +48,9 @@ # Use 1 for yes, 0 for no. Default: 0 # # kitdeployparams (optional) Filename containing a list of kit deployment -# parameters. The name should be the full path name of -# the file relative to /other_files -# +# parameters. The name should be the full path name of +# the file relative to /other_files +# # kitlicense (mandatory) Kit license string to be built into all # kitcomponent packages. (template default "EPL") # @@ -75,7 +75,7 @@ kit: # osarch= # isinternal= # kitdeployparams=sample/kitdeployparams.lst - # kittarfilename= + # kittarfilename= # # kitrepo: This stanza defines a Kit Package Repository. # There must be at least one kitrepo stanza in a kit build file. @@ -86,8 +86,8 @@ kit: # # kitrepo attributes: # kitrepoid (mandatory) Kit package repository ID. Must be unique within -# this file. A typical name may be something like: -# "._". +# this file. A typical name may be something like: +# "._". # (ex. "rhels6.4_x86_64") # # osbasename (mandatory) OS distro base name. (ex. "rhels") @@ -119,17 +119,17 @@ kitrepo: # - 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 +# basename (mandatory) Kit component base name # (ex. "myproduct_compute") # # description (optional) Kit component description # -# version (optional) Kit component version. The default is +# version (optional) Kit component version. The default is # the kit version. # -# release (optional) Kit component release. The default is the +# release (optional) Kit component release. The default is the # kit release. # # serverroles (mandatory) Comma-separated list of node types that this @@ -144,17 +144,17 @@ kitrepo: # dependencies. These kit components can be included in # this kit or in other kits. # -# ospkgdeps (optional) Comma-separated list of OS RPM dependency +# ospkgdeps (optional) Comma-separated list of OS RPM dependency # basenames. # These packages must be shipped with the OS distro. # (ex. "libacl(x86-32)") # -# kitpkgdeps (mandatory IF product RPMs will be included in this Kit) -# Comma-separated list of RPM basenames. Each RPM must -# be defined in a separate kitpackage stanza. Each RPM -# package must be in the same kitrepo as this kit component. +# kitpkgdeps (mandatory IF product RPMs will be included in this Kit) +# Comma-separated list of RPM basenames. Each RPM must +# be defined in a separate kitpackage stanza. Each RPM +# package must be in the same kitrepo as this kit component. # (ex. "xlc(x86-32)") -# +# # non_native_pkgs (optional) # Comma-separated list of non-native package # paths that will be included as files in this kit @@ -221,7 +221,7 @@ kitcomponent: # # # kitpackage attributes: -# filename (mandatory) Package filename. The filename may contain +# filename (mandatory) Package filename. The filename may contain # wildcards to avoid needing to # specify an explicit package version-release filename. # @@ -230,17 +230,17 @@ kitcomponent: # be built for the first repo only. For the other repos, # a symlink is created to the package built for the first repo. # -# isexternalpkg (mandatory) Indicates if the package will be included +# isexternalpkg (mandatory) Indicates if the package will be included # in this kit or added later. # 'no' or '0' means the package is included. # 'yes' or '1' means the packages will be added later. # The default if not set is 'no'. # -# rpm_prebuiltdir (mandatory IF isexternalpkg=no) Path to the directory -# containing the pre-built RPMs relative to +# rpm_prebuiltdir (mandatory IF isexternalpkg=no) Path to the directory +# containing the pre-built RPMs relative to # /source_packages directory. -# For example, if the file is -# "/source_packages/foobar/foo.rpm" +# For example, if the file is +# "/source_packages/foobar/foo.rpm" # then set "rpm_prebuiltdir=foobar". kitpackage: filename=pkg1-*.noarch.rpm