diff options
author | Dean Sanner <dsanner@us.ibm.com> | 2016-09-26 10:23:49 -0500 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-09-27 11:48:25 -0400 |
commit | db863b6ef111b993fce46f9cdd22671a46d4c5a8 (patch) | |
tree | aec1deab3506a17915b8f6332353262fd13d56d7 | |
parent | a2c4ff00033939dd3168e8e6472d13d81c0742a6 (diff) | |
download | talos-hostboot-db863b6ef111b993fce46f9cdd22671a46d4c5a8.tar.gz talos-hostboot-db863b6ef111b993fce46f9cdd22671a46d4c5a8.zip |
Update to latest bbuild for sim
Change-Id: I77c12271c9fe9b0a456d73e1d3c66bed8a8d3002
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30297
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r-- | src/build/citest/etc/bbuild | 2 | ||||
-rw-r--r-- | src/build/citest/etc/patches/update_simicsInfo_fi160914a900.patch | 10 | ||||
-rwxr-xr-x | src/build/citest/etc/workarounds.presimsetup | 5 |
3 files changed, 1 insertions, 16 deletions
diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index b0bb3c01b..7cc28e3db 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1 +1 @@ -/esw/fips910/Builds/b0907a_1638.910 +/esw/fips910/Builds/b0926a_1640.910 diff --git a/src/build/citest/etc/patches/update_simicsInfo_fi160914a900.patch b/src/build/citest/etc/patches/update_simicsInfo_fi160914a900.patch deleted file mode 100644 index 188178803..000000000 --- a/src/build/citest/etc/patches/update_simicsInfo_fi160914a900.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- simu.b0907a/data/simicsInfo 2016-09-19 12:58:13.377973614 -0500 -+++ simu/data/simicsInfo 2016-09-19 12:56:08.167930877 -0500 -@@ -76,5 +76,5 @@ - ##################################### - WSALIAS DEFAULT BBLEVEL none - WSALIAS DEFAULT SIMICSLEVEL env/vtechf/simics-4.8.0/simics-4.8.140/bin --WSALIAS DEFAULT FIPSLEVEL env/simf/simics-4.8.0/simics-4.8.140/fips/fld36/fi160905a900.48 --WSALIAS DEFAULT MAMBOLEVEL env/mamboa/2016_07_27__4.8 -+WSALIAS DEFAULT FIPSLEVEL env/simf/simics-4.8.0/simics-4.8.140/fips/fld36/fi160914a900.48 -+WSALIAS DEFAULT MAMBOLEVEL env/mamboa/2016_09_13__4.8 diff --git a/src/build/citest/etc/workarounds.presimsetup b/src/build/citest/etc/workarounds.presimsetup index caa7592ce..bf3113561 100755 --- a/src/build/citest/etc/workarounds.presimsetup +++ b/src/build/citest/etc/workarounds.presimsetup @@ -34,8 +34,3 @@ #egrep -v "WSALIAS DEFAULT FIPSLEVEL|WSALIAS DEFAULT SIMICSLEVEL" $BACKING_BUILD/src/simu/data/simicsInfo > $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT FIPSLEVEL env/gfwb/simics-4.2.0/simics-4.2.83/fips/fld36/fi120201a700.42" >> $sb/simu/data/simicsInfo #echo "WSALIAS DEFAULT SIMICSLEVEL env/vtechb/simics-4.2.0/simics-4.2.83/bin" >> $sb/simu/data/simicsInfo - -echo "+++ Updating Simics Level for PM CI runs" -mkdir -p $sb/simu/data -cp $BACKING_BUILD/src/simu/data/simicsInfo $sb/simu/data/simicsInfo -patch -p0 $sb/simu/data/simicsInfo $PROJECT_ROOT/src/build/citest/etc/patches/update_simicsInfo_fi160914a900.patch |