From 78cf402b580cd7ae97b560ef13229b1394ec5b0e Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Mon, 21 Jan 2013 20:05:22 +0000 Subject: [PATCH] A small followup to last week's check in for external non_native_pkgs support. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14933 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-buildkit/bin/buildkit | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit index 0b2e04f02..98c13f004 100755 --- a/xCAT-buildkit/bin/buildkit +++ b/xCAT-buildkit/bin/buildkit @@ -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;