[Xcat-commit] [xcat-core] xCAT branch master updated. 18a3c268643b43ed3b59570bf8a258859c83fa94

[Guang C. L. <xca...@so...>]

The branch, master has been updated
       via  18a3c268643b43ed3b59570bf8a258859c83fa94 (commit)
      from  1e2329be1dd1f725cd6bc341a8fcad5efdd85e59 (commit)

-----------------------------------------------------------------------
commit 18a3c268643b43ed3b59570bf8a258859c83fa94
Author: ligc <lig...@cn...>
Date:   Sun Aug 31 23:24:42 2014 -0400

    fix for bug 4265: remove getxcatdocs from PCM build

-----------------------------------------------------------------------
diff --git a/buildcore.sh b/buildcore.sh
index 770bdd5..3517040 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -44,10 +44,11 @@ FRS=/home/frs/project/x/xc/xcat
 ALLBUILD="perl-xCAT xCAT-client xCAT-server xCAT-IBMhpc xCAT-rmc xCAT-UI xCAT-test xCAT-buildkit xCAT xCATsn xCAT-genesis-scripts xCAT-OpenStack xCAT-SoftLayer xCAT-OpenStack-baremetal"
 ZVMBUILD="perl-xCAT xCAT-server xCAT-UI"
 ZVMLINK="xCAT-client xCAT xCATsn"
-# xCAT has PCM specific configuration - conserver-xcat, syslinux-xcat
+# xCAT and xCATsn have PCM specific configuration - conserver-xcat, syslinux-xcat
 # xCAT-server has PCM specific configuration - RESTAPI(perl-JSON) 
-PCMBUILD="xCAT xCAT-server xCATsn"
-PCMLINK="perl-xCAT xCAT-client xCAT-buildkit xCAT-genesis-scripts-x86_64"
+# xCAT-client has PCM specific configuration - getxcatdocs(perl-JSON) 
+PCMBUILD="xCAT xCAT-server xCAT-client xCATsn"
+PCMLINK="perl-xCAT xCAT-buildkit xCAT-genesis-scripts-x86_64"
 # Note: for FSM, the FlexCAT rpm is built separately from gsa/git
 FSMBUILD="perl-xCAT xCAT-client xCAT-server"
 FSMLINK=""
diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec
index d507ea0..fc7ffcb 100644
--- a/xCAT-client/xCAT-client.spec
+++ b/xCAT-client/xCAT-client.spec
@@ -13,6 +13,8 @@ Prefix: /opt/xcat
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
 %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"
 %ifos linux
@@ -115,6 +117,14 @@ cp share/xcat/tools/* $RPM_BUILD_ROOT/%{prefix}/share/xcat/tools
 #cp usr/share/xcat/scripts/setup-local-client.sh $RPM_BUILD_ROOT/usr/share/xcat/scripts/setup-local-client.sh
 #chmod 755 $RPM_BUILD_ROOT/usr/share/xcat/scripts/setup-local-client.sh
 
+# PCM does not need getxcatdocs
+# getxcatdocs causes xCAT-client requires perl-JSON, which is not shipped with PCM
+%if %pcm
+rm -f $RPM_BUILD_ROOT/%{prefix}/bin/getxcatdocs
+rm -f $RPM_BUILD_ROOT/%{prefix}/share/doc/man1/getxcatdocs.1.html
+rm -f $RPM_BUILD_ROOT/%{prefix}/share/man/man1/getxcatdocs.1
+%endif
+
 # These links get made in the RPM_BUILD_ROOT/prefix area
 ln -sf xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rpower
 ln -sf xcatclient $RPM_BUILD_ROOT/%{prefix}/bin/rscan