From 69e472b279f836c767a28dc1cd13c4c3cf445241 Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Mon, 23 Oct 2017 14:09:50 -0500 Subject: Move up backing build and remove simsetup workarounds Move up the backing build to what FSP-CI is running and remove the workarounds from workarounds.postsimsetup that were there to get tor stuff merged Change-Id: I969b27d5244b3e818f2a729a0c93d310263e07b9 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48705 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: William G. Hoffa Reviewed-by: Daniel M. Crowell --- src/build/citest/etc/bbuild | 2 +- src/build/citest/etc/workarounds.postsimsetup | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'src/build') diff --git a/src/build/citest/etc/bbuild b/src/build/citest/etc/bbuild index 96acf79f5..cdf8125eb 100644 --- a/src/build/citest/etc/bbuild +++ b/src/build/citest/etc/bbuild @@ -1 +1 @@ -/esw/fips910/Builds/b0930a_1740.910 +/esw/fips910/Builds/b1019a_1742.910 diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index 55475ddc0..44d482e04 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -32,17 +32,8 @@ #mkdir -p $sb/simu/data/cec-chip/ #cp $BACKING_BUILD/src/simu/data/cec-chip/base_cec_chip_file $sb/simu/data/cec-chip #patch -p0 $sb/simu/data/cec-chip/base_cec_chip_file $PROJECT_ROOT/src/build/citest/etc/patches/my_patch_File -#pull in href tor -sbex -t 1035576 -#pull in hwsv tor -sbex -t 1034144 -mkdir $sb/../obj/ppc/hwsv/server/buildhwpfimport/hwpf2/tools/x86_binaries -p -cp /gsa/rchgsa/home/c/r/crgeddes/documents/hbBuild/p9_ipl_build $sb/../obj/ppc/hwsv/server/buildhwpfimport/hwpf2/tools/x86_binaries/ -# Workaround for hb prime -chmod 777 $sb/../ -R - -- cgit v1.2.1