diff options
| -rwxr-xr-x | src/build/buildpnor/genPnorImages.pl | 13 | ||||
| -rwxr-xr-x | src/build/mkrules/hbfw/img/makefile | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/build/buildpnor/genPnorImages.pl b/src/build/buildpnor/genPnorImages.pl index 5d5d207d2..f610f38a0 100755 --- a/src/build/buildpnor/genPnorImages.pl +++ b/src/build/buildpnor/genPnorImages.pl @@ -597,6 +597,19 @@ 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"); + 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. diff --git a/src/build/mkrules/hbfw/img/makefile b/src/build/mkrules/hbfw/img/makefile index d3bb9347c..60e5ec083 100755 --- a/src/build/mkrules/hbfw/img/makefile +++ b/src/build/mkrules/hbfw/img/makefile @@ -31,6 +31,12 @@ .include <${RULES_MK}> +# TODO RTC 182358 +# It's not clear that the open source signing tooling can tolerate parallelism +# when building the signature cache, so force sequential mode until that aspect +# is 100% verified +.NOTPARALLEL: + .if($(CONTEXT:R) == "ppc") VPATH += ../fsp |
