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

A small followup to last week's check in for external non_native_pkgs support.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14933 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2013-01-21 20:05:22 +00:00
parent 3f4bb3a0ae
commit 78cf402b58
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xCAT-buildkit/bin/buildkit
View File

@ -819,7 +819,7 @@ sub kit_buildtar
# build the tarfile
my $extpkgs = '';
if ($::HAVE_EXTERNAL_PKG or defined($::NON_NATIVE_PKG)) { $extpkgs = '.NEED_PRODUCT_PKGS'; }
if ($::HAVE_EXTERNAL_PKG or $::HAVE_NON_NATIVE_PKGS) { $extpkgs = '.NEED_PRODUCT_PKGS'; }
my $kitname = $::bldkit_config->{kit}{entries}[0]->{kitname};
my $tarfile = $::build_dir."/".$kitname.$extpkgs.".tar.bz2";
if ( system("cd $::build_dir; tar -cjhf $tarfile $kitname/*") ) {
@ -1737,6 +1737,7 @@ sub build_kitcomp
}
if ( !$::NON_NATIVE_PKGS->{$comp->{kitcompname}}{$kcmetaname} ) {
$cmd = "cd $tmpdir/..;mv $comp->{kitcompname} $comp->{basename}; tar -czf $rpmbuild_dir/SOURCES/$comp->{basename}.tar.gz $comp->{basename};mv $comp->{basename} $comp->{kitcompname}";
$::HAVE_NON_NATIVE_PKGS = 1;
if ( system($cmd) ) {
print "Error creating tarfile $rpmbuild_dir/SOURCES/$comp->{kitreponame}-$comp->{kitcompname}.tar from $sourcedir/*";
return 1;