Pushing HB plugins and related files for building errltool

Change-Id: I91d432a901fb4ee6de469ca8076637eaa2e1315d
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/60027
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-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>
Reviewed-by: Sampa Misra <sampmisr@in.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 55 insertions, 7 deletions

diff --git a/src/build/mkrules/dist.rules.mk b/src/build/mkrules/dist.rules.mk
index 7cfcd40f6..b9b120112 100644
--- a/src/build/mkrules/dist.rules.mk
+++ b/src/build/mkrules/dist.rules.mk
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2012,2014
+# Contributors Listed Below - COPYRIGHT 2012,2018
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -206,7 +208,7 @@ $(foreach targ,$(COPY_FILES), \
 define __COPY_RENAME_TARGET_RULE
 $(TARGET_DIR)$(3)/$(1): $(ROOTPATH)/$(2) $(TESTVAR_CHANGED_FILE)
 	@mkdir -p $$(dir $$@)
-	@echo "    CP-RENAME $$(notdir $$<) $$(notdir $$@)" && cp -r $$< $$@
+	@echo "    CP-RENAME $$(notdir $$<) $$(notdir $$@)" && cp -Lr $$< $$@
 endef
 define COPY_RENAME_TARGET_RULE
 $(call __COPY_RENAME_TARGET_RULE,$(1),$(2))
@@ -443,4 +445,3 @@ $(1)_TARGET_ECHO_START:
 
 endef
 $(foreach targ,$(VALID_TARGETS),$(eval $(call INSTANTIATE_TARGET,$(targ))))
-
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk
index f791aa2fe..422c2bad6 100755
--- a/src/build/mkrules/dist.targets.mk
+++ b/src/build/mkrules/dist.targets.mk
@@ -40,7 +40,7 @@ ROOTPATH = ../../..
 #
 
 # Content targets.
-VALID_TARGETS = fsp tools openpower vpo
+VALID_TARGETS = fsp tools openpower vpo errltool
 
 #
 # Files which are to be directly copied into content targets.
@@ -149,8 +149,49 @@ COPY_RENAME_FILES = \
     securerom.list.bz2:img/securerom.list.bz2:tools,vpo,openpower \
     securerom.bin.modinfo:img/securerom.bin.modinfo:tools,vpo,openpower \
     $(foreach file, $(call ROOTPATH_WILDCARD,src/build/debug/Hostboot/*.pm), \
-    Hostboot/$(notdir $(file)):$(file):tools,vpo,openpower)
-
+    Hostboot/$(notdir $(file)):$(file):tools,vpo,openpower) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,obj/genfiles/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    hbplugins/Makefile:obj/genfiles/plugins/Makefile:errltool \
+    hbplugins/prdf/Makefile:obj/genfiles/plugins/prdf/Makefile_errl:errltool \
+    $(foreach file, $(call ROOTPATH_WILDCARD,obj/genfiles/plugins/prdf/*.h), \
+    hbplugins/prdf/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,obj/genfiles/plugins/prdf/*.C), \
+    hbplugins/prdf/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,obj/genfiles/plugins/prdf/*.H), \
+    hbplugins/prdf/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/sbeio/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/initservice/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/mbox/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/secureboot/common/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/errl/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/fsi/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/vpd/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/i2c/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/runtime/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/isteps/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/usr/scom/plugins/*.*), \
+    hbplugins/$(notdir $(file)):$(file):errltool) \
+    $(foreach file, $(call ROOTPATH_WILDCARD,src/import/chips/p9/common/include/*.H), \
+    hbplugins/prdf/$(notdir $(file)):$(file):errltool) \
+    hwas/common/hwasCallout.H:src/include/usr/hwas/common/hwasCallout.H:errltool \
+    devicefw/driverif.H:src/include/usr/devicefw/driverif.H:errltool \
+    devicefw/userif.H:src/include/usr/devicefw/userif.H:errltool \
+    hbplugins/prdf/p9_pm_recovery_ffdc_defines.H:src/import/chips/p9/procedures/hwp/pm/p9_pm_recovery_ffdc_defines.H:errltool \
+    hbplugins/prdf/p9_hcd_memmap_base.H:src/import/chips/p9/procedures/hwp/lib/p9_hcd_memmap_base.H:errltool \
+    hbplugins/prdf/p9_hcd_header_defs.H:src/import/chips/p9/procedures/hwp/lib/p9_hcd_header_defs.H:errltool \
+    hbplugins/prdf/p9_ppe_defs.H:src/import/chips/p9/procedures/hwp/lib/p9_ppe_defs.H:errltool
+    
 #
 # Symbolic links created in the target.
 #
diff --git a/src/build/tools/hbDistribute b/src/build/tools/hbDistribute
index 41936cb93..8c501ad97 100755
--- a/src/build/tools/hbDistribute
+++ b/src/build/tools/hbDistribute
@@ -95,6 +95,11 @@ do
             shift
         ;;
 
+        "--errltool")
+            TARGET="errltool_TARGET"
+            shift
+        ;;
+
         "--release")
             TARGET="ALL"
             shift
@@ -156,7 +161,8 @@ fi
 echo "sbfw dir = ${SBFW_DIR}"
 # Verify SBFW directory or default to sandbox.
 if [ "${SBFW_DIR}" == "invalid directory" -a \
-    "${TARGET}" != "openpower_TARGET" ]; then
+    "${TARGET}" != "openpower_TARGET" -a \
+    "${TARGET}" != "errltool_TARGET" ]; then
     if [ -z "${SANDBOXROOT}" -o -z "${SANDBOXNAME}" ]; then
         echo "ERROR:SBFW - No path specified and \$SANDBOXBASE undefined."
         print_usage