genNodeMrwXml.pl: added --config option

Without the config option, the script was computing the MRW name
and output file names based on system name and build type. But,
for fleetwood's 2N and MST config, we were having to do unnecessary
copies to and from 2N/MST version of MRW to non 2N/MST version.
This causes issues when multiple compile jobs are running in
parallel.

Change-Id: Ib4e2d10b05f182379fd0be1cacbf1a7b9efba642
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/57820
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 9 insertions, 10 deletions

diff --git a/src/usr/targeting/common/genNodeMrwXml.pl b/src/usr/targeting/common/genNodeMrwXml.pl
index cd27af354..e38b9d8ef 100755
--- a/src/usr/targeting/common/genNodeMrwXml.pl
+++ b/src/usr/targeting/common/genNodeMrwXml.pl
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2013,2014
+# Contributors Listed Below - COPYRIGHT 2013,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -75,6 +75,7 @@ my $usage = 0;
 my $nodeCount = 0;
 my $outFileDir = "";
 my $build = "fsp";
+my $config = "";
 use Getopt::Long;
 
 GetOptions( "mrwdir:s"  => \$mrwdir,
@@ -83,6 +84,7 @@ GetOptions( "mrwdir:s"  => \$mrwdir,
             "nodeCount:i" => \$nodeCount,
             "outfileDir:s" => \$outFileDir,
             "build:s"   => \$build,
+            "config:s" => \$config,
             "help"      => \$usage, );
 
 
@@ -119,22 +121,16 @@ else
     die "ERROR: $build is not valid. Valid values are fsp or hb\n";
 }
 
-my $nodeSuffix = "";
-if( ($sysnodes) && ($sysnodes =~ /2/) )
-{
-    $nodeSuffix = "2N_"
-}
-
 #create files
 my $mrw_file =
-    open_mrw_file($mrwdir, "${SYSNAME}_${nodeSuffix}${fileSuffix}.mrw.xml");
+    open_mrw_file($mrwdir, "${SYSNAME}${config}_${fileSuffix}.mrw.xml");
 $sysInfo = XMLin($mrw_file,
                 ForceArray=>1);
 #print Dumper($sysInfo);
 for my $j(0..($nodeCount))
 {
     $outFile =
-        "$outFileDir/${SYSNAME}_${nodeSuffix}node_$j"."_${fileSuffix}.mrw.xml";
+        "$outFileDir/${SYSNAME}${config}_node_$j"."_${fileSuffix}.mrw.xml";
     push @nodeOutFiles, [$outFile];
 }
 
@@ -249,7 +245,7 @@ Usage:
 
 
     $scriptname --system=sysname --systemnodes=2 --mrwdir=pathname
-                     --build=hb --nodeCount=nodeCount
+                     --build=hb --nodeCount=nodeCount --config=_MST
         --system=systemname
               Specify which system MRW XML to be generated
                The system name will be set as uppercase
@@ -265,6 +261,9 @@ Usage:
               Specify if HostBoot build (hb) or FSP build (fsp)
         --nodeCount
               Specify the max number of nodes for the system
+        --config
+              Name of the config we are compiling for. This is used in the
+              input mrw name and output node xmls as well.
 
 \n";
 }