From f517c6c5507ad449f37417500ad4a36f6295c4d7 Mon Sep 17 00:00:00 2001 From: Dave Heller Date: Wed, 11 Jul 2018 23:24:51 -0400 Subject: 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 Resolves #144 Change-Id: I5bf04bd1c8501695eccbb5e7229101cb9dab7078 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62362 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Nicholas E. Bofferding Reviewed-by: Marshall J. Wilks Reviewed-by: Daniel M. Crowell --- src/build/buildpnor/genPnorImages.pl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/build/buildpnor/genPnorImages.pl') 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; -- cgit v1.2.1