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

integrated patch provided in 3594

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8-pcm@16577 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott
2013-06-07 17:52:18 +00:00
parent bd64e444c0
commit e6332ef245
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-buildkit/bin/buildkit
View File

@@ -1839,7 +1839,7 @@ sub gen_kitcomp_spec
if (defined($comp->{postuninstall})) {
$postunscript = &load_script("$scriptdir$comp->{postuninstall}"); }
if (defined($comp->{non_native_pkgs})) {
$nonnativepkgs = '\n';
$nonnativepkgs = "\n";
$nonnativepkgs .= "mkdir -p \$RPM_BUILD_ROOT/opt/xcat/kits/$kitname/$kitcompname \n";
$nonnativepkgs .= "cp -a * \$RPM_BUILD_ROOT/opt/xcat/kits/$kitname/$kitcompname \n";
$sourcetar = "Source: $comp->{basename}.tar.gz";
@@ -1872,8 +1872,6 @@ sub gen_kitcomp_spec
}
# Write the generated spec file
my $joined_lines = join("\n",@lines);
@lines = split(/\\n/,$joined_lines);
mkpath($tmpdir);
my $NSF;
unless ( open( $NSF, ">$tmpdir/$comp->{kitcompname}.spec" ) ) {
@@ -1882,7 +1880,9 @@ sub gen_kitcomp_spec
if ($::VERBOSE) {
print "Created kitcomponent spec file $tmpdir/$comp->{basename}.spec \n";
}
print $NSF @lines;
foreach my $line (@lines) {
print $NSF $line,"\n";
}
close($NSF);
return 0;
@@ -1916,7 +1916,7 @@ sub load_script
my @lines = <$SF>;
close $SF;
my $script_contents = join('\n', @lines);
my $script_contents = join('', @lines);
return $script_contents;
}