From 250258dbb7ef237dafbc36f132d1dc4a8096a51b Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Wed, 30 Oct 2013 00:42:53 -0700 Subject: [PATCH] fixed bug 3867, --- xCAT-server/lib/xcat/plugins/kit.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/kit.pm b/xCAT-server/lib/xcat/plugins/kit.pm index 40d6e92d9..656367dde 100644 --- a/xCAT-server/lib/xcat/plugins/kit.pm +++ b/xCAT-server/lib/xcat/plugins/kit.pm @@ -1730,7 +1730,7 @@ sub validate_os{ return 1; } - if ( $osimage->{arch} ne $kitcomp->{osarch} ) { + if ( $osimage->{arch} ne $kitcomp->{osarch} && $kitcomp->{osarch} ne 'noarch' ) { # my %rsp; # push@{ $rsp{data} }, "osimage $os is not compatible with kit component $kitcomp->{kitcompname} with attribute arch"; # xCAT::MsgUtils->message( "E", \%rsp, $::CALLBACK ); @@ -2013,7 +2013,7 @@ sub addkitcomp return 1; } - if ( $os{$osimage}{arch} ne $kitcomps{$kitcomp}{osarch} ) { + if ( $os{$osimage}{arch} ne $kitcomps{$kitcomp}{osarch} && $kitcomps{$kitcomp}{osarch} ne 'noarch' ) { my %rsp; push@{ $rsp{data} }, "osimage $osimage is not compatible with kit component $kitcomp with attribute arch"; xCAT::MsgUtils->message( "E", \%rsp, $callback ); @@ -3328,7 +3328,7 @@ sub chkkitcomp return 1; } - if ( $os{$osimage}{arch} ne $kitcomps{$kitcomp}{osarch} ) { + if ( $os{$osimage}{arch} ne $kitcomps{$kitcomp}{osarch} && $kitcomps{$kitcomp}{osarch} ne 'noarch' ) { my %rsp; push@{ $rsp{data} }, "kit component $kitcomp is not compatible with osimage $osimage with attribute arch"; xCAT::MsgUtils->message( "E", \%rsp, $callback ); @@ -4516,7 +4516,7 @@ sub get_compat_kitreponames { if (defined($kitrepo->{osminorversion}) && $kitrepo->{osminorversion} ne $osdistro->{minorversion}) { next; } - if (defined($kitrepo->{osarch}) && $kitrepo->{osarch} ne $osdistro->{arch}) { + if (defined($kitrepo->{osarch}) && $kitrepo->{osarch} ne $osdistro->{arch} && $kitrepo->{osarch} ne 'noarch') { next; }