From 36b8c67f806ead2b4668130c9b991e4fbfe02710 Mon Sep 17 00:00:00 2001
From: zhaoertao <ertaozh@cn.ibm.com>
Date: Wed, 5 Mar 2014 00:50:53 -0800
Subject: [PATCH 1/2] fix bug 4007: DFM support Powerlinux, mkvm return error

---
 perl-xCAT/xCAT/FSPUtils.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/FSPUtils.pm b/perl-xCAT/xCAT/FSPUtils.pm
index eb1dda4b6..6072f6a25 100644
--- a/perl-xCAT/xCAT/FSPUtils.pm
+++ b/perl-xCAT/xCAT/FSPUtils.pm
@@ -67,7 +67,7 @@ sub getHcpAttribs
 	}
     }
     
-    my @ps = $tabs->{ppc}->getAllNodeAttribs(['node','parent','nodetype','hcp']); 
+    my @ps = $tabs->{ppc}->getAllNodeAttribs(['node','parent','nodetype','hcp','id']); 
     for my $entry ( @ps ) {
         my $tmp_parent = $entry->{parent};
         my $tmp_node = $entry->{node};
@@ -79,6 +79,9 @@ sub getHcpAttribs
         if (defined($tmp_node) && defined($tmp_type) && ($tmp_type eq "blade") && defined($entry->{hcp})) {
             push @{$ppchash{$tmp_node}{children}}, $entry->{hcp};
         }
+        if (defined($tmp_node) && defined($entry->{id}) && defined($tmp_parent) && defined($tmp_type) && ($tmp_type eq "lpar")) {
+            $ppchash{$tmp_parent}{mapping}{$tmp_node} = $entry->{id};
+        }
 
 	#if(exists($ppchash{$tmp_node})) {
 	#     if( defined($tmp_type) ) {

From 69a80e72ee522f9d2f1471f69baca60422742f9f Mon Sep 17 00:00:00 2001
From: ligc <ligc@cn.ibm.com>
Date: Thu, 6 Mar 2014 15:47:15 -0600
Subject: [PATCH 2/2] fix for bug 4010: remove xcatws.cgi from PCM build

---
 xCAT-server/xCAT-server.spec | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 mode change 100644 => 100755 xCAT-server/xCAT-server.spec

diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
old mode 100644
new mode 100755
index 51a1421be..f3ec85b2e
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -26,6 +26,9 @@ Obsoletes: atftp-xcat
 
 %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)
+
 %if %fsm
 # nothing needed here
 %else
@@ -308,14 +311,24 @@ mkdir -p $RPM_BUILD_ROOT/%{prefix}/ws
 mkdir -p $RPM_BUILD_ROOT/etc/apache2/conf.d
 mkdir -p $RPM_BUILD_ROOT/etc/httpd/conf.d
 cp xCAT-wsapi/* $RPM_BUILD_ROOT/%{prefix}/ws
+# PCM does not need xcatws.cgi
+# xcatws.cgi causes xCAT-server requires perl-JSON, which is not shipped with PCM
+%if %pcm
+rm -f $RPM_BUILD_ROOT/%{prefix}/ws/xcatws.cgi
+%endif
+
 %if %fsm
 %else
 echo "ScriptAlias /xcatrhevh %{prefix}/ws/xcatrhevh.cgi" > $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat-ws.conf
+%if %notpcm
 echo "ScriptAlias /xcatws %{prefix}/ws/xcatws.cgi" >> $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat-ws.conf
+%endif
 cat $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.apache2 >>  $RPM_BUILD_ROOT/etc/apache2/conf.d/xcat-ws.conf
 
 echo "ScriptAlias /xcatrhevh %{prefix}/ws/xcatrhevh.cgi" > $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat-ws.conf
+%if %notpcm
 echo "ScriptAlias /xcatws %{prefix}/ws/xcatws.cgi" >> $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat-ws.conf
+%endif
 cat $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.httpd >> $RPM_BUILD_ROOT/etc/httpd/conf.d/xcat-ws.conf
 %endif
 rm -f $RPM_BUILD_ROOT/%{prefix}/ws/xcat-ws.conf.apache2