diff options
| -rwxr-xr-x | src/build/buildpnor/genPnorImages.pl | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/build/buildpnor/genPnorImages.pl b/src/build/buildpnor/genPnorImages.pl index d90f18023..b5633d66f 100755 --- a/src/build/buildpnor/genPnorImages.pl +++ b/src/build/buildpnor/genPnorImages.pl @@ -527,19 +527,6 @@ sub manipulateImages my $componentId = convertEyecatchToCompId($eyeCatch); $CUR_OPEN_SIGN_REQUEST .= " --sign-project-FW-token $componentId "; - # @TODO RTC 182358 - # This is a tactical workaround for the signing tooling not being - # able to handle muliple different platform binary contents for the same - # component ID. The signing tooling should be modified to tolerate this - # scenario, at which point the workaround can be removed. - if ($buildType eq "fspbuild") - { - my @signatureFiles= - glob("$bin_dir/SIGNTOOL_*/$componentId/*sig_p.raw $bin_dir/SIGNTOOL_*/$componentId/*key_p.sig"); - print "Deleting @signatureFiles\n"; - unlink @signatureFiles; - } - # Used for corrupting partitions. By default all protected offsets start # immediately after the container header which is size = PAGE_SIZE. # *Note: this is before ECC. @@ -554,6 +541,20 @@ sub manipulateImages my $nodeIDstr = ""; foreach my $bin_file (@binFilesArray) { + # @TODO RTC 182358 + # This is a tactical workaround for the signing tooling not being + # able to handle muliple different platform binary (or multiple + # node) contents for the same component ID. The signing tooling + # should be modified to tolerate this scenario, at which point the + # workaround can be removed. + if ($buildType eq "fspbuild") + { + my @signatureFiles= + glob("$bin_dir/SIGNTOOL_*/$componentId/*sig_p.raw $bin_dir/SIGNTOOL_*/$componentId/*key_p.sig"); + print "Deleting @signatureFiles\n"; + unlink @signatureFiles; + } + # If there are more than 1 bin files per section, final name should # have a node ID included. if (scalar @binFilesArray > 1) |
