Updating backing build to b0928a_1141.760 for FSI to work.

Change-Id: I521870c1f11fb33ae3829b96c6c0fca18c1a0c62
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/391
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 49 insertions, 3 deletions

diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild
index c3e824944..0789fab2d 100644
--- a/src/build/citest/etc/bbuild
+++ b/src/build/citest/etc/bbuild
@@ -1 +1 @@
-/esw/fips750/Builds/b0812a_1134.750
+/esw/fips760/Builds/b0928a_1141.760
diff --git a/src/build/citest/etc/workarounds b/src/build/citest/etc/workarounds
index f92b381d8..434bf98d5 100755
--- a/src/build/citest/etc/workarounds
+++ b/src/build/citest/etc/workarounds
@@ -1,4 +1,26 @@
 #!/bin/sh
+#  IBM_PROLOG_BEGIN_TAG
+#  This is an automatically generated prolog.
+#
+#  $Source: src/build/citest/etc/workarounds $
+#
+#  IBM CONFIDENTIAL
+#
+#  COPYRIGHT International Business Machines Corp. 2011
+#
+#  p1
+#
+#  Object Code Only (OCO) source materials
+#  Licensed Internal Code Source Materials
+#  IBM HostBoot Licensed Internal Code
+#
+#  The source code for this program is not published or other-
+#  wise divested of its trade secrets, irrespective of what has
+#  been deposited with the U.S. Copyright Office.
+#
+#  Origin: 30
+#
+#  IBM_PROLOG_END
 
 echo "+++ Copy desired SALERNO config file to sandbox and modify L3 to 8MB."
 mkdir -p $sb/simu/configs
@@ -7,6 +29,19 @@ sed -i -e's/SETENV GFW_P8_SALERNO_L3_MB_SIZE.*/SETENV GFW_P8_SALERNO_L3_MB_SIZE
 # Backing build already contains 910431.  Leave this workaround here for future scomdef files
 #sed -i -e's/SETENV GFW_P8_SALERNO_MODEL_EC.*/SETENV GFW_P8_SALERNO_MODEL_EC 910431/' $sb/simu/configs/P8_SALERNO.config
 
+echo "+++ Copy desired VENICE config file to sandbox and modify L3 to 8MB."
+mkdir -p $sb/simu/configs
+cp $BACKING_BUILD/src/simu/configs/P8_VENICE.config $sb/simu/configs
+sed -i -e's/SETENV GFW_P8_VENICE_L3_MB_SIZE.*/SETENV GFW_P8_VENICE_L3_MB_SIZE 8/' $sb/simu/configs/P8_VENICE.config
+# Backing build already contains 910431.  Leave this workaround here for future scomdef files
+#sed -i -e's/SETENV GFW_P8_VENICE_MODEL_EC.*/SETENV GFW_P8_VENICE_MODEL_EC 910431/' $sb/simu/configs/P8_VENICE.config
+
+#echo "+++ Update to new simics build."
+#mkdir -p $sb/simu/data
+#grep -v "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo
+#echo "WSALIAS HOSTBOOT_LEVEL FIPSLEVEL env/gfwa/simics-4.2.0/simics-4.2.77/fips/fld36/fi110919b700.42" >> $sb/simu/data/simicsInfo
+
+
 echo "+++ Patch for PHYP flight recorder."
 sed -i -e's/.*PHYPLEVEL.*//' $sb/../simics/.simics_flightrecorder
 sed -i -e's/.*PHYP_PATCH_LEVEL.*//' $sb/../simics/.simics_flightrecorder
diff --git a/src/build/tools/cpfiles.pl b/src/build/tools/cpfiles.pl
index aa71875ae..7121892c1 100755
--- a/src/build/tools/cpfiles.pl
+++ b/src/build/tools/cpfiles.pl
@@ -56,7 +56,8 @@ sub printUsage;
 
 #List of files to copy.  Path is relative to git repository.
 my @files = ("src/build/tools/hb-parsedump.pl",
-             "src/build/simics/*",
+             "src/build/simics/hb-simdebug.py",
+             "src/build/simics/post_model_hook.simics",
              "src/usr/errl/parser/bin/errlparser", 
              "img/hbotStringFile",
              "img/hbicore.syms",
@@ -153,7 +154,7 @@ elsif (defined ($sandbox))
 {
     unless ($sandbox ne "")
     {
-        die ('ERROR: No path specified and env $SANBOXBASE = NULL'."\n");
+        die ('ERROR: No path specified and env $SANDBOXBASE = NULL'."\n");
     }
 
     print "sandbox = $sandbox\n";
@@ -222,6 +223,16 @@ foreach (@files)
         $copyDir = $simicsDir;
     }
 
+    #Delete the old file first (handles copying over symlinks)
+    $command = sprintf("rm -f %s/%s%s", $copyDir, $filename, $suffix);
+    if ($command ne "")
+    {
+        print "$command\n";
+        `$command`;
+    }
+    $command = "";
+
+
     #Check if user wants to copy test versions to hbicore.<syms|bin|list>
     if ($test == 1)
     {