3 files changed, 43 insertions, 35 deletions
diff --git a/src/build/mkrules/dist_targets.mk b/src/build/mkrules/dist_targets.mk
index 9ba947045..0f9bbc761 100644
--- a/src/build/mkrules/dist_targets.mk
+++ b/src/build/mkrules/dist_targets.mk
@@ -180,7 +180,15 @@ fsp.tar_CONTENTS = \
 	$(call ROOTPATH_WILDCARD_RECURSIVE,src/usr/pnor/common)) \
     src/include/kernel/hbdescriptor.H \
     src/include/kernel/hbterminatetypes.H \
-    src/build/tools/hwp_id.pl
+    src/build/tools/hwp_id.pl \
+    obj/genfiles/plugins/makefile:plugins/ \
+    obj/genfiles/plugins/hbfwUdIds.H:plugins/ \
+    obj/genfiles/plugins/fapiPlatHwpErrParser.H:plugins/ \
+    obj/genfiles/plugins/errludattribute.H:plugins/ \
+    $(addsuffix :plugins/,\
+        $(call ROOTPATH_WILDCARD,obj/genfiles/plugins/hbfwSrcParse*.C)) \
+    $(addsuffix :plugins/,\
+        $(call ROOTPATH_WILDCARD,src/usr/*/plugins/*))
 
 #
 # Portions of the FSP sandbox which must be rebuilt based on file changes.
diff --git a/src/build/mkrules/hbfw/fsp/makefile b/src/build/mkrules/hbfw/fsp/makefile
index 2b2845ddb..e894387ce 100755
--- a/src/build/mkrules/hbfw/fsp/makefile
+++ b/src/build/mkrules/hbfw/fsp/makefile
@@ -1,25 +1,25 @@
-#   IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/build/mkrules/hbfw/fsp/makefile $
+# $Source: src/build/mkrules/hbfw/fsp/makefile $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2012
+# COPYRIGHT International Business Machines Corp. 2012,2013
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# Object Code Only (OCO) source materials
+# Licensed Internal Code Source Materials
+# IBM HostBoot Licensed Internal Code
 #
-#  The source code for this program is not published or other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
 #
-#  Origin: 30
+# Origin: 30
 #
-#  IBM_PROLOG_END_TAG
+# IBM_PROLOG_END_TAG
 
 #
 # FSP Destination: src/hbfw/fsp/makefile
@@ -32,11 +32,11 @@
 
 .if(${CONTEXT:R} == "ppc")
 
-EXPINC_SUBDIRS   += targeting hwas pnor
-OBJECTS_SUBDIRS  += 
-EXPLIB_SUBDIRS   += 
-EXPSHLIB_SUBDIRS += targeting
-STANDARD_SUBDIRS += targeting
+EXPINC_SUBDIRS   += targeting hwas pnor plugins
+OBJECTS_SUBDIRS  += plugins
+EXPLIB_SUBDIRS   += plugins
+EXPSHLIB_SUBDIRS += targeting plugins
+STANDARD_SUBDIRS += targeting plugins
 RUNBVT_SUBDIRS   += 
 
 INCLUDES = hbdescriptor.H \
diff --git a/src/build/trace/tracehash_hb.pl b/src/build/trace/tracehash_hb.pl
index 42edcdff0..035357717 100755
--- a/src/build/trace/tracehash_hb.pl
+++ b/src/build/trace/tracehash_hb.pl
@@ -1,26 +1,26 @@
 #!/usr/bin/perl -w
-#  IBM_PROLOG_BEGIN_TAG
-#  This is an automatically generated prolog.
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
 #
-#  $Source: src/build/trace/tracehash_hb.pl $
+# $Source: src/build/trace/tracehash_hb.pl $
 #
-#  IBM CONFIDENTIAL
+# IBM CONFIDENTIAL
 #
-#  COPYRIGHT International Business Machines Corp. 2011
+# COPYRIGHT International Business Machines Corp. 2011,2013
 #
-#  p1
+# p1
 #
-#  Object Code Only (OCO) source materials
-#  Licensed Internal Code Source Materials
-#  IBM HostBoot Licensed Internal Code
+# Object Code Only (OCO) source materials
+# Licensed Internal Code Source Materials
+# IBM HostBoot Licensed Internal Code
 #
-#  The source code for this program is not published or other-
-#  wise divested of its trade secrets, irrespective of what has
-#  been deposited with the U.S. Copyright Office.
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
 #
-#  Origin: 30
+# Origin: 30
 #
-#  IBM_PROLOG_END
+# IBM_PROLOG_END_TAG
 # File tracehash.pl created by B J Zander.
 # 05/08/2011 - Update by andrewg to work in host boot environment
 
@@ -839,7 +839,7 @@ sub write_string_file() {
     }
 
     # Write out the updated string file.
-    print STDOUT "\nWriting updated hash||string file...\n\n";
+    print STDOUT "\nWriting updated hash||string file ($string_file)...\n\n";
 
     @keys = sort(keys(%string_file_array));