diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2019-08-06 14:55:16 -0500 |
|---|---|---|
| committer | Daniel M Crowell <dcrowell@us.ibm.com> | 2019-08-07 17:10:09 -0500 |
| commit | b4b84d189356806a5dae7382a0d8c05afe1fee12 (patch) | |
| tree | bf24d762f11a4d72b3e8f4dd2b895e305c50ec75 /src/build | |
| parent | 256d3e0a8914915a8436773990c2e9af403d7777 (diff) | |
| download | talos-hostboot-b4b84d189356806a5dae7382a0d8c05afe1fee12.tar.gz talos-hostboot-b4b84d189356806a5dae7382a0d8c05afe1fee12.zip | |
Fix BPM script to put temp files into obj tree
Depending on where the input files and scripts live and if we are
compiling in a backing build or a sandbox, the temporary (.crc)
files can sometimes be created inside a readonly tree. This change
will place the temp files in the same (writeable) output directory
as the final binary images.
Change-Id: Ib5e6ed5ffeb825d46681eda89d93311931365663
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/81787
Reviewed-by: Matthew Raybuck <matthew.raybuck@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: Daniel M Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build')
| -rwxr-xr-x | src/build/buildpnor/buildBpmFlashImages.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/build/buildpnor/buildBpmFlashImages.pl b/src/build/buildpnor/buildBpmFlashImages.pl index f4c69eaaa..630ad5436 100755 --- a/src/build/buildpnor/buildBpmFlashImages.pl +++ b/src/build/buildpnor/buildBpmFlashImages.pl @@ -119,7 +119,7 @@ sub generateFirmwareImage my ($i_fileName, $i_outputDir) = @_; my $this_func = (caller(0))[3]; - my $intermediateFileName = generateIntermediateImage($i_fileName); + my $intermediateFileName = generateIntermediateImage($i_fileName,$i_outputDir); open my $inputFileHandle, '<:encoding(UTF-8)', $intermediateFileName or die "Failed to open $intermediateFileName"; @@ -745,7 +745,7 @@ sub generateOutputNameAndVersion ################################################################################ sub generateIntermediateImage { - my $i_fileName = shift; + my ($i_fileName, $i_outputDir) = @_; # Parse the file name into its filename, path, and suffix. my ($name, $path, $suffix) = fileparse($i_fileName, ".txt"); @@ -753,7 +753,7 @@ sub generateIntermediateImage # Parse the file name into its filename, path, and suffix. my ($utilName, $utilPath, $utilSuffix) = fileparse($bpmUtilScript, ".txt"); - my $intermediateFileName = $utilPath . $name . ".crc"; + my $intermediateFileName = $i_outputDir . $name . ".crc"; # Call the python script which will insert the CRC my $pythonReturn = system($bpmUtilScript, |
