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

allow same kitcomponent basenames

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14609 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2012-12-10 21:26:39 +00:00
parent 17de040994
commit bba164615f
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xCAT-buildkit/bin/buildkit
View File

@ -655,7 +655,7 @@ sub kit_buildrepo1
if (-r $rpm) { next; }
# Build it
if ($::VERBOSE) { print "building kitcomponet metapackage for $kc->{basename} \n";}
if ($::VERBOSE) { print "building kitcomponent metapackage for $kc->{basename} \n";}
if (&build_kitcomp($kc)) {
print "Error building kitcomponent metapackage for $kc->{basename} \n";
return 1;
@ -1131,15 +1131,28 @@ sub validate_bldkitconf
}
}
# Make sure each kitcomponent has unique basename
# Make sure each kitcomponent has unique basename/repoid
# If same basename, make sure version/release are same, too
my $kc_count = scalar @{$::bldkit_config->{kitcomponent}{entries}};
if ($kc_count > 1) {
foreach my $kci (0..$kc_count-2) {
foreach my $kci2 ($kci+1..$kc_count-1) {
if ( $::bldkit_config->{kitcomponent}{entries}[$kci]->{basename}
eq $::bldkit_config->{kitcomponent}{entries}[$kci2]->{basename} ) {
print "There are two or more kitcomponent sections which are defined with the same basename \"$::bldkit_config->{kitcomponent}{entries}[$kci]->{basename}\". \n";
return 1;
if ( $::bldkit_config->{kitcomponent}{entries}[$kci]->{kitrepoid}
eq $::bldkit_config->{kitcomponent}{entries}[$kci2]->{kitrepoid} ) {
print "Two or more kitcomponents are defined with the same basename \"$::bldkit_config->{kitcomponent}{entries}[$kci]->{basename}\" and the same repoid \"$::bldkit_config->{kitcomponent}{entries}[$kci]->{kitrepoid}\". \n";
return 1;
}
if ( ($::bldkit_config->{kitcomponent}{entries}[$kci]->{version}
ne $::bldkit_config->{kitcomponent}{entries}[$kci2]->{version}) ||
($::bldkit_config->{kitcomponent}{entries}[$kci]->{release}
ne $::bldkit_config->{kitcomponent}{entries}[$kci2]->{release})
) {
print "Two or more kitcomponents are defined with the same basename \"$::bldkit_config->{kitcomponent}{entries}[$kci]->{basename}\" but with different version or release. \n";
return 1;
}
}
}
}

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

@ -60,6 +60,13 @@ kitrepo:
# 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