From 2474427a83a138fda4164d2d0fa0effd2c01087f Mon Sep 17 00:00:00 2001 From: ligc Date: Fri, 4 Apr 2014 04:33:37 -0400 Subject: [PATCH] Temporary remove the grub2-xcat dependency for PCM, it blockes PCM test --- xCAT-server/xCAT-server.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index eab526467..91f5b5351 100755 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -16,19 +16,23 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root AutoReqProv: no %endif -# AIX will build with an arch of "ppc" -# also need to fix Requires for AIX -%ifos linux -BuildArch: noarch -Requires: perl-IO-Socket-SSL perl-XML-Simple perl-XML-Parser grub2-xcat -Obsoletes: atftp-xcat -%endif - %define fsm %(if [ "$fsm" = "1" ];then echo 1; else echo 0; fi) %define pcm %(if [ "$pcm" = "1" ];then echo 1; else echo 0; fi) %define notpcm %(if [ "$pcm" = "1" ];then echo 0; else echo 1; fi) +# AIX will build with an arch of "ppc" +# also need to fix Requires for AIX +%ifos linux +BuildArch: noarch +Requires: perl-IO-Socket-SSL perl-XML-Simple perl-XML-Parser +Obsoletes: atftp-xcat +%endif + +%if %notpcm +Requires: grub2-xcat +%endif + %if %fsm # nothing needed here %else