arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defect 3334 - add kitlicense support to buildkit

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15008 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2013-01-29 13:42:45 +00:00
parent 9a9b28a9f3
commit 4ee58f5941
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-buildkit/bin/buildkit
View File

@ -111,7 +111,12 @@ $::deploy_dir = $::build_dir; #kitname appended by validate_bldkitconf routine
value_desc=>'Must be: empty string or relative path string',
mandatory=>0,
base_dir=>'other_files',
cp_to_kitconfig=>2} }, # 2 = rename with KIT_KITNAME_ on cp
cp_to_kitconfig=>2}, # 2 = rename with KIT_KITNAME_ on cp
kitlicense=> {
description=>'The Kit license string to be built into all kitcomponent packages.',
value_desc=>'any string',
mandatory=>1,
cp_to_kitconfig=>0} },
kitrepo => {kitrepoid => {
description=>'The Kit Package Repository ID. (e.g., rhels-6.2-x86_64)',
value_desc=>'Must be: Generic Name String, unique in kit',
@ -1835,6 +1840,7 @@ sub gen_kitcomp_spec
s/<<<INSERT_kitcomponent_basename_HERE>>>/$comp->{basename}/;
s/<<<INSERT_kitcomponent_version_HERE>>>/$comp->{version}/;
s/<<<INSERT_kitcomponent_release_HERE>>>/$comp->{release}/;
s/<<<INSERT_kit_license_HERE>>>/$::bldkit_config->{kit}{entries}[0]->{kitlicense}/;
s/<<<INSERT_kitcomponent_ospkgdeps_HERE>>>/$comp->{ospkgdeps}/;
s/<<<INSERT_kitcomponent_kitpkgdeps_HERE>>>/$comp->{kitpkgdeps}/;
s/<<<INSERT_kitcomponent_kitcompdeps_HERE>>>/$comp->{kitcompdeps}/;

3
xCAT-buildkit/share/xcat/kits/kit_template/buildkit.conf
View File

@ -20,12 +20,15 @@
# kitdeployparams (optional) Filename containing a list of kit deployment
# parameters, relative to
# <Kit Build Directory>/other_files
# kitlicense (mandatory) Kit license string to be built into all
# kitcomponent packages
kit:
basename=<<<INSERT_kitbasename_HERE>>>
description=description for <<<INSERT_kitbasename_HERE>>>
version=1.0
ostype=Linux
kitdeployparams=sample/kitdeployparams.lst
kitlicense=EPL
# kitrepo: This section defines a Kit Package Repository.

2
xCAT-buildkit/share/xcat/kits/kitcomponent.spec.template
View File

@ -3,7 +3,7 @@ Name: <<<INSERT_kitcomponent_basename_HERE>>>
Version: <<<INSERT_kitcomponent_version_HERE>>>
Release: <<<INSERT_kitcomponent_release_HERE>>>
Group: Applications/System
License: EPL
License: <<<INSERT_kit_license_HERE>>>
BuildArch: noarch
Requires: <<<INSERT_kitcomponent_ospkgdeps_HERE>>>,<<<INSERT_kitcomponent_kitpkgdeps_HERE>>>,<<<INSERT_kitcomponent_kitcompdeps_HERE>>>