From 5df02b528fa60eb71c5d6a2fadca62f0ca1e13fe Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 26 Mar 2009 22:38:47 +0000
Subject: [PATCH] - required ppc64 versions of nb rpms on x86/x86_64 MN -
 removed run of mknb on ppc64 - added initial zLinux support

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3008 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 buildcore.sh                |  6 +++++-
 xCAT-server/sbin/xcatconfig | 43 ++++++++++++-------------------------
 xCAT/xCAT.spec              | 14 ++++++++----
 xCATsn/xCATsn.spec          | 12 +++++++++--
 4 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/buildcore.sh b/buildcore.sh
index 66e064cb7..a7bc3617a 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -98,6 +98,8 @@ if $GREP -E '^[UAD] +xCATsn/' ../coresvnup; then
    mv /usr/src/$pkg/RPMS/*/xCATsn-$VER*rpm $DESTDIR
    ./makexcatsnrpm ppc64
    mv /usr/src/$pkg/RPMS/*/xCATsn-$VER*rpm $DESTDIR
+   ./makexcatsnrpm s390x
+   mv /usr/src/$pkg/RPMS/*/xCATsn-$VER*rpm $DESTDIR
 fi
 if $GREP -E '^[UAD] +xCAT/' ../coresvnup; then
    UPLOAD=1
@@ -106,9 +108,11 @@ if $GREP -E '^[UAD] +xCAT/' ../coresvnup; then
    ./makexcatrpm x86_64
    mv /usr/src/$pkg/RPMS/*/xCAT-$VER*rpm $DESTDIR
    mv /usr/src/$pkg/SRPMS/xCAT-$VER*rpm $SRCDIR
+   ./makexcatrpm i386
+   mv /usr/src/$pkg/RPMS/*/xCAT-$VER*rpm $DESTDIR
    ./makexcatrpm ppc64
    mv /usr/src/$pkg/RPMS/*/xCAT-$VER*rpm $DESTDIR
-   ./makexcatrpm i386
+   ./makexcatrpm s390x
    mv /usr/src/$pkg/RPMS/*/xCAT-$VER*rpm $DESTDIR
 fi
 
diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index 19b94ade6..70931ee17 100644
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -1134,36 +1134,21 @@ if ($::osname eq 'Linux')
         }
     }
 
-    # run mknb
-    if ($::arch eq "x86_64")
+    # run mknb - only needed for Intel platforms for now
+    if ($::arch eq "x86_64" || $::arch eq "x86")
     {
-        my $cmd = "$::XCATROOT/sbin/mknb x86_64";
-        my $outref = xCAT::Utils->runcmd("$cmd", 0);
-        if ($::RUNCMD_RC != 0)
-        {
-            xCAT::MsgUtils->message('E',
-                     "The mknb x86_64 command returned error: $::RUNCMD_RC.\n");
-        }
-        else
-        {
-            xCAT::MsgUtils->message('I',
-                            "The mknb x86_64 command was run with no error.\n");
-        }
-    }
-    if ($::arch eq "ppc64")
-    {
-        my $cmd = "$::XCATROOT/sbin/mknb ppc64";
-        my $outref = xCAT::Utils->runcmd("$cmd", 0);
-        if ($::RUNCMD_RC != 0)
-        {
-            xCAT::MsgUtils->message('E',
-                      "The mknb ppc64 command returned error: $::RUNCMD_RC.\n");
-        }
-        else
-        {
-            xCAT::MsgUtils->message('I',
-                             "The mknb ppc64 command was run with no error.\n");
-        }
+    	foreach my $ar (qw(x86 x86_64 ppc64)) {
+        	my $cmd = "$::XCATROOT/sbin/mknb $ar";
+        	my $outref = xCAT::Utils->runcmd("$cmd", 0);
+        	if ($::RUNCMD_RC != 0) 	{
+            	xCAT::MsgUtils->message('E',
+                     "The mknb $ar command returned error: $::RUNCMD_RC.\n");
+        		}
+        	else {
+            	xCAT::MsgUtils->message('I',
+                            "The mknb $ar command was run with no error.\n");
+        		}
+        	}
     }
 
     # run makenetworks
diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec
index 17fea2418..0d90ab583 100644
--- a/xCAT/xCAT.spec
+++ b/xCAT/xCAT.spec
@@ -18,11 +18,19 @@ Provides: xCAT = %{version}
 Requires: xCAT-server xCAT-client perl-DBD-SQLite
 
 %ifos linux
-Requires: atftp dhcp httpd nfs-utils expect conserver fping bind perl-XML-Parser vsftpd
+# yaboot-xcat is pulled in so any MN can manage ppc nodes
+Requires: atftp dhcp httpd nfs-utils expect fping bind perl-XML-Parser vsftpd yaboot-xcat
+%ifarch s390x
+# No additional requires for zLinux right now
+%else
+Requires: conserver
+%endif
 %endif
 
 %ifarch i386 i586 i686 x86 x86_64
-Requires: xCAT-nbroot-oss-x86 xCAT-nbroot-core-x86 xCAT-nbkernel-x86 xCAT-nbroot-oss-x86_64 xCAT-nbroot-core-x86_64 xCAT-nbkernel-x86_64 syslinux
+# All versions of the nb rpms are pulled in so an x86 MN can manage nodes of any arch.
+# The nb rpms are used for dhcp-based discovery, and flashing, so for now we do not need them on a ppc MN.
+Requires: xCAT-nbroot-oss-x86 xCAT-nbroot-core-x86 xCAT-nbkernel-x86 xCAT-nbroot-oss-x86_64 xCAT-nbroot-core-x86_64 xCAT-nbkernel-x86_64 xCAT-nbroot-oss-ppc64 xCAT-nbroot-core-ppc64 xCAT-nbkernel-ppc64 syslinux
 Requires: ipmitool >= 1.8.9
 %endif
 
@@ -207,8 +215,6 @@ if [ "$1" = "1" ]; then #Only if installing for the first time..
 %ifarch i386 i586 i686 x86 x86_64
        $RPM_INSTALL_PREFIX0/sbin/mknb x86
        $RPM_INSTALL_PREFIX0/sbin/mknb x86_64
-%endif
-%ifarch ppc ppc64
        $RPM_INSTALL_PREFIX0/sbin/mknb ppc64
 %endif
     fi
diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec
index 793051d88..f56879df5 100644
--- a/xCATsn/xCATsn.spec
+++ b/xCATsn/xCATsn.spec
@@ -17,11 +17,19 @@ Provides: xCATsn = %{version}
 Requires: xCAT-server xCAT-client  perl-xCAT perl-XML-Parser
 
 %ifos linux
-Requires: atftp dhcp httpd nfs-utils expect conserver fping bind
+# yaboot-xcat is pulled in so any SN can manage ppc nodes
+Requires: atftp dhcp httpd nfs-utils expect fping bind yaboot-xcat
+%ifarch s390x
+# No additional requires for zLinux right now
+%else
+Requires: conserver
+%endif
 %endif
 
 %ifarch i386 i586 i686 x86 x86_64
-Requires: xCAT-nbroot-oss-x86_64 xCAT-nbroot-core-x86_64 xCAT-nbkernel-x86_64 syslinux
+# All versions of the nb rpms are pulled in so an x86 MN can manage nodes of any arch.
+# The nb rpms are used for dhcp-based discovery, and flashing, so for now we do not need them on a ppc MN.
+Requires: xCAT-nbroot-oss-x86 xCAT-nbroot-core-x86 xCAT-nbkernel-x86 xCAT-nbroot-oss-x86_64 xCAT-nbroot-core-x86_64 xCAT-nbkernel-x86_64 xCAT-nbroot-oss-ppc64 xCAT-nbroot-core-ppc64 xCAT-nbkernel-ppc64 syslinux
 Requires: ipmitool >= 1.8.9
 %endif