Secure Boot: Move genPnorImage dependency hash into sort function

- Some platforms/perl versions don't work unless hash is inside sort function

Change-Id: If2c7d9f32a9f500272107acd188a317816be9516
RTC: 174017
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43914
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: Stephen M. Cprek <smcprek@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/src/build/buildpnor/genPnorImages.pl b/src/build/buildpnor/genPnorImages.pl
index cec025ef3..d94675652 100755
--- a/src/build/buildpnor/genPnorImages.pl
+++ b/src/build/buildpnor/genPnorImages.pl
@@ -461,12 +461,16 @@ foreach my $header (keys %sb_hdrs)
 # Custom sort to ensure images are handled in the correct dependency order.
 # If a dependency is not specified in the hash used, use default behavior.
 ################################################################################
-# Hardcoded defined order that binfiles should be handled.
-my %partitionDeps = ( HBBL => 0,
-                      HBB => 1,
-                      HBI => 2);
+
 sub partitionDepSort
 {
+    # Hardcoded defined order that binfiles should be handled. Fails to work
+    # properly unless declared inside the sort routine under some platforms/perl
+    # versions
+    my %partitionDeps = ( HBBL => 0,
+                          HBB => 1,
+                          HBI => 2);
+
     # If $a exists but $b does not, set $a < $b
     if (exists $partitionDeps{$a} && !exists $partitionDeps{$b})
     {