diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2016-06-07 08:13:18 -0500 |
|---|---|---|
| committer | Joshua Hunsberger <jahunsbe@us.ibm.com> | 2017-10-23 16:04:19 -0500 |
| commit | 9ec6fe28035fbecaf67e8099011248feaf5ae138 (patch) | |
| tree | d4cb144a7442001fd9694d2bbff4f052fe9a4678 /import/tools | |
| parent | 50ddc6eb84d3644eb14220f397e79c53540b0bc1 (diff) | |
| download | talos-hcode-9ec6fe28035fbecaf67e8099011248feaf5ae138.tar.gz talos-hcode-9ec6fe28035fbecaf67e8099011248feaf5ae138.zip | |
Intermittent jenkins failures related to xip tool ops on image files
-Corrected .bin image dependencies for xip tool operations
on raw image bin file. Dependency was incorrectly specified
as setbuild_user should be setbuild_host as the final op.
Change-Id: Ic0296dd4ef0970eef44a9a46afb30caa740bf358
RTC:155667
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25442
Tested-by: Jenkins Server
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Diffstat (limited to 'import/tools')
| -rw-r--r-- | import/tools/imageProcs/cme_image.mk | 4 | ||||
| -rw-r--r-- | import/tools/imageProcs/pstate_gpe_image.mk | 2 | ||||
| -rw-r--r-- | import/tools/imageProcs/restore_image.mk | 2 | ||||
| -rw-r--r-- | import/tools/imageProcs/sgpe_image.mk | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/import/tools/imageProcs/cme_image.mk b/import/tools/imageProcs/cme_image.mk index 3cb2f18a..b5259ea3 100644 --- a/import/tools/imageProcs/cme_image.mk +++ b/import/tools/imageProcs/cme_image.mk @@ -30,9 +30,9 @@ IMAGE=cme_image # various sub images are finished - add a dependancy on both below CME_BIN_FILE=$(IMAGEPATH)/cme/cme.bin -# adding the build user name is the last thing done to the +# adding the build host name is the last thing done to the # raw cem_image.bin file before we append sections -CME_IMAGE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user +CME_IMAGE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_host CME_IMAGE_DEPS+= $(CME_BIN_FILE) diff --git a/import/tools/imageProcs/pstate_gpe_image.mk b/import/tools/imageProcs/pstate_gpe_image.mk index 916962a8..8406600b 100644 --- a/import/tools/imageProcs/pstate_gpe_image.mk +++ b/import/tools/imageProcs/pstate_gpe_image.mk @@ -25,7 +25,7 @@ IMAGE=pstate_gpe_image # add dependency on the raw image.bin file completion -PGPE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user +PGPE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_host # dependencies for bin files needed in the pgpe xip image LVL1_BL_BIN_FILE=$(IMAGEPATH)/pgpe_lvl1_copier/pgpe_lvl1_copier.bin diff --git a/import/tools/imageProcs/restore_image.mk b/import/tools/imageProcs/restore_image.mk index 2130d9aa..943587ca 100644 --- a/import/tools/imageProcs/restore_image.mk +++ b/import/tools/imageProcs/restore_image.mk @@ -26,7 +26,7 @@ IMAGE=restore_image # create dependency on the restore image hcode and the final step in the # raw image.bin creation -SELF_REST_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user +SELF_REST_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_host SELF_RESTORE_BIN=$(ROOTPATH)/chips/p9/procedures/utils/stopreg/selfRest.bin CPRM_HEADER_BIN=$(IMAGEPATH)/cpmr_header/cpmr_header.bin diff --git a/import/tools/imageProcs/sgpe_image.mk b/import/tools/imageProcs/sgpe_image.mk index 756311cb..6e7e0686 100644 --- a/import/tools/imageProcs/sgpe_image.mk +++ b/import/tools/imageProcs/sgpe_image.mk @@ -25,7 +25,7 @@ IMAGE=sgpe_image # add dependency on the raw image.bin file completion -SGPE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_user +SGPE_DEPS=$$($(IMAGE)_PATH)/.$(IMAGE).setbuild_host # dependencies for bin files needed in the sgpe xip image QPMR_BIN_FILE=$(IMAGEPATH)/qpmr_header/qpmr_header.bin |
