From df090f8a4ab81dca72f388ace268ac2848ff44a0 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 11 Jan 2013 11:06:15 +0000
Subject: [PATCH] For kit component external packages, the external packages
 names are always changed, for example, there might be different versions.  in
 buildkit.conf, external packages should be set with certain names, and
 buildkit command should not require certain package names.  they could work
 with basename only.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14860 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-buildkit/bin/buildkit | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-buildkit/bin/buildkit b/xCAT-buildkit/bin/buildkit
index 395f06833..f05045e1c 100755
--- a/xCAT-buildkit/bin/buildkit
+++ b/xCAT-buildkit/bin/buildkit
@@ -1238,7 +1238,7 @@ sub validate_bldkitconf
             $d =~ s/^([\w\.\-]+)[<>=]*.*$/$1/;
             my $found = 0;
             foreach my $kp (@{$::bldkit_config->{kitpackage}{entries}}) {
-              if ( $kp->{filename} =~ /^$d[\.\-]/ ) {
+              if ( $kp->{filename} =~ /^$d[\.\-]?/ ) {
                 foreach my $kprid (split(/,/, $kp->{kitrepoid})) {
                   $kprid =~ s/\s+//g;
                   if ($kc->{kitrepoid} eq $kprid) {
@@ -2304,8 +2304,8 @@ sub kit_addpkgs
               next;
             }
             if ( ($ext_filename ne '') && ($ext_reponames ne '') ){
-              my $fromfile = $rpmdir."/".$ext_filename;
-              if ( !(-r $fromfile) ){
+              my $fromfile = $rpmdir."/".$ext_filename."*";
+              if ( system("ls $fromfile") ){
                 print  "The product package file $ext_filename could not be read from the package directory $rpmdir. \n";
                 # Cleanup
                 system ("rm -Rf /tmp/buildkit_workdir");