diff options
| author | Dan Crowell <dcrowell@us.ibm.com> | 2019-06-28 16:26:27 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-07-01 09:25:02 -0500 |
| commit | 9f597d2c7a66d1454e37f3b41c95f2b31bd2722d (patch) | |
| tree | 4ab81ccd4676d27172c6157a996bfb58e54549c1 /src/usr/targeting | |
| parent | 4154aa7077447bad31241e4c7405040c5c314ee9 (diff) | |
| download | blackbird-hostboot-9f597d2c7a66d1454e37f3b41c95f2b31bd2722d.tar.gz blackbird-hostboot-9f597d2c7a66d1454e37f3b41c95f2b31bd2722d.zip | |
Fix errludattribute changes that broke the build
Split the plugin file into a separate file and renamed it to make
it obvious which file (runtime or parser) is which.
Change-Id: I60d1b9cf7e5816e2d03ce56f6529c0b88178c489
CQ: SW469233
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79762
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: Matt Derksen <mderkse1@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/targeting')
| -rwxr-xr-x | src/usr/targeting/common/xmltohb/xmltohb.pl | 11 | ||||
| -rwxr-xr-x | src/usr/targeting/xmltohb/makefile | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl index e3d0f3677..58a5261da 100755 --- a/src/usr/targeting/common/xmltohb/xmltohb.pl +++ b/src/usr/targeting/common/xmltohb/xmltohb.pl @@ -26,10 +26,7 @@ # # Purpose: -# Author: Nick Bofferding -# Last Updated: 09/09/2011 -# -# Version: 1.0 +# Process the attribute xml files, generate code, create binaries, etc # # Change Log ********************************************************** # @@ -371,9 +368,9 @@ if( !($cfgSrcOutputDir =~ "none") ) close $attrErrlCFile; mkdir("$cfgSrcOutputDir/errl"); - open(ATTR_ATTRERRL_H_FILE,">$cfgSrcOutputDir"."errl/errludattribute_gen.H") + open(ATTR_ATTRERRL_H_FILE,">$cfgSrcOutputDir"."errl/errludattributeP_gen.H") or croak ("Attribute errlog H file: \"$cfgSrcOutputDir" - . "errl/errludattribute_gen.H\" could not be opened."); + . "errl/errludattributeP_gen.H\" could not be opened."); my $attrErrlHFile = *ATTR_ATTRERRL_H_FILE; writeAttrErrlHFile($attributes,$attrErrlHFile); close $attrErrlHFile; @@ -2952,7 +2949,7 @@ sub writeAttrErrlCFile { sub writeAttrErrlHFile { my($attributes,$outFile) = @_; - # Inserts inside LOGPARSER leg in errludattribute.H + # Included by errludattributeP.H print $outFile "\n"; print $outFile "namespace ERRORLOG\n"; print $outFile "{\n"; diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile index 5a14ebe88..47fc1f472 100755 --- a/src/usr/targeting/xmltohb/makefile +++ b/src/usr/targeting/xmltohb/makefile @@ -232,7 +232,7 @@ CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES:.bin=.xml}) CLEAN_TARGETS += ${GENDIR}/${HB_PLAT_ATTR_SRVC_H} CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_GENERIC_XML} CLEAN_TARGETS += ${GENDIR}/${XMLTOHB_FAPI_XML} -CLEAN_TARGETS += ${GENDIR}/errl/errludattribute_gen.H +CLEAN_TARGETS += ${GENDIR}/errl/errludattributeP_gen.H CLEAN_TARGETS += ${GENDIR}/errludattribute_gen.C CLEAN_TARGETS += ${GENDIR}/errl/errludtarget.H CLEAN_TARGETS += ${GENDIR}/targAttrInfo.csv @@ -412,7 +412,7 @@ $(XMLTOHB_RAN_INDICATION): ${XMLTOHB_COMPILER_SCRIPT} \ $(addprefix --fapi-attributes-xml-file=,${GENDIR}/${XMLTOHB_FAPI_XML}) \ --src-output-dir=$(GENDIR) --img-output-dir=none \ --img-output-file=none - cp ${GENDIR_ERRL}/errludattribute_gen.H ${GENDIR_PLUGINS} + cp ${GENDIR_ERRL}/errludattributeP_gen.H ${GENDIR_PLUGINS} cp ${GENDIR_ERRL}/errludtarget.H ${GENDIR_PLUGINS} touch $(XMLTOHB_RAN_INDICATION) |
