diff options
| author | Dave Heller <hellerda@us.ibm.com> | 2018-07-11 23:24:51 -0400 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-07-24 09:23:30 -0500 |
| commit | f517c6c5507ad449f37417500ad4a36f6295c4d7 (patch) | |
| tree | bc4abe5e2b8e4a74e0224337125300f6b8a19760 /src/build/buildpnor/genPnorImages.pl | |
| parent | 97c196cc741f1d934044976ef94b3e48b418f300 (diff) | |
| download | talos-hostboot-f517c6c5507ad449f37417500ad4a36f6295c4d7.tar.gz talos-hostboot-f517c6c5507ad449f37417500ad4a36f6295c4d7.zip | |
Secure Boot: Don't override user setting of SB_KEEP_CACHE
The previous patch set SB_KEEP_CACHE=true in genPnorImages.pl in a way that
would override the user setting. This was a bad idea. The desired behavior
is to set SB_KEEP_CACHE=true but only if it has not already been set (through
environment) by the user.
Signed-off-by: Dave Heller <hellerda@us.ibm.com>
Resolves #144
Change-Id: I5bf04bd1c8501695eccbb5e7229101cb9dab7078
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62362
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: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Marshall J. Wilks <mjwilks@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build/buildpnor/genPnorImages.pl')
| -rwxr-xr-x | src/build/buildpnor/genPnorImages.pl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/build/buildpnor/genPnorImages.pl b/src/build/buildpnor/genPnorImages.pl index 9de7b3113..a25a0b148 100755 --- a/src/build/buildpnor/genPnorImages.pl +++ b/src/build/buildpnor/genPnorImages.pl @@ -269,8 +269,14 @@ if ($secureboot) } ### Open POWER signing +# In most cases this is desired, but do not override a value set by user +if(!$ENV{'SB_KEEP_CACHE'}) +{ + $ENV{'SB_KEEP_CACHE'} = "true"; +} + my $OPEN_SIGN_REQUEST= - "SB_KEEP_CACHE=true $SIGNING_DIR/crtSignedContainer.sh --scratchDir $bin_dir "; + "$SIGNING_DIR/crtSignedContainer.sh --scratchDir $bin_dir "; # By default key transition container is unused my $OPEN_SIGN_KEY_TRANS_REQUEST = $OPEN_SIGN_REQUEST; |
