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 | |
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')
-rwxr-xr-x | src/build/mkrules/dist.targets.mk | 4 | ||||
-rw-r--r-- | src/include/usr/errl/errludattribute.H | 10 | ||||
-rw-r--r-- | src/usr/errl/errludattribute.C | 1 | ||||
-rw-r--r-- | src/usr/errl/plugins/errludattributeP.H | 41 | ||||
-rw-r--r-- | src/usr/errl/plugins/errludparserfactoryerrl.H | 4 | ||||
-rwxr-xr-x | src/usr/targeting/common/xmltohb/xmltohb.pl | 11 | ||||
-rwxr-xr-x | src/usr/targeting/xmltohb/makefile | 4 |
7 files changed, 52 insertions, 23 deletions
diff --git a/src/build/mkrules/dist.targets.mk b/src/build/mkrules/dist.targets.mk index 879522d06..808ff7c2b 100755 --- a/src/build/mkrules/dist.targets.mk +++ b/src/build/mkrules/dist.targets.mk @@ -358,8 +358,8 @@ fsp.tar_CONTENTS = \ src/include/usr/hwas/common/hwasCallout.H:hwas/ \ src/include/usr/devicefw/driverif.H:devicefw/ \ src/include/usr/devicefw/userif.H:devicefw/ \ - obj/genfiles/plugins/errludattribute_gen.H:plugins/ \ - src/include/usr/errl/errludattribute.H:plugins/ \ + obj/genfiles/plugins/errludattributeP_gen.H:plugins/ \ + src/usr/errl/plugins/errludattributeP.H:plugins/ \ obj/genfiles/plugins/errludtarget.H:plugins/ \ $(addsuffix :plugins/,\ $(call ROOTPATH_WILDCARD,obj/genfiles/plugins/hbfwSrcParse*.C)) \ diff --git a/src/include/usr/errl/errludattribute.H b/src/include/usr/errl/errludattribute.H index 369f4a562..8321785cb 100644 --- a/src/include/usr/errl/errludattribute.H +++ b/src/include/usr/errl/errludattribute.H @@ -31,8 +31,6 @@ * an error log. */ -#if !defined(PARSER) && !defined(LOGPARSER) - #include <errl/errluserdetails.H> namespace TARGETING // Forward reference @@ -85,13 +83,5 @@ class ErrlUserDetailsAttribute : public ErrlUserDetails { uint32_t iv_dataSize; }; } -#else // if LOGPARSER defined - -#include "errluserdetails.H" - -// Pull in the auto-generated portion for the parser -#include <errl/errludattribute_gen.H> - -#endif #endif //ERRL_UDATTRIBUTE_H diff --git a/src/usr/errl/errludattribute.C b/src/usr/errl/errludattribute.C index 4f2b322f7..5d031545f 100644 --- a/src/usr/errl/errludattribute.C +++ b/src/usr/errl/errludattribute.C @@ -79,5 +79,6 @@ ErrlUserDetailsAttribute::~ErrlUserDetailsAttribute() // Pull in the auto-generated portion // ::addData // ::dumpAll +// Generated by xmltohb.pl #include <errludattribute_gen.C> diff --git a/src/usr/errl/plugins/errludattributeP.H b/src/usr/errl/plugins/errludattributeP.H new file mode 100644 index 000000000..d097ad9e7 --- /dev/null +++ b/src/usr/errl/plugins/errludattributeP.H @@ -0,0 +1,41 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/errl/plugins/errludattributeP.H $ */ +/* */ +/* OpenPOWER HostBoot Project */ +/* */ +/* Contributors Listed Below - COPYRIGHT 2019 */ +/* [+] 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. */ +/* You may obtain a copy of the License at */ +/* */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* */ +/* Unless required by applicable law or agreed to in writing, software */ +/* distributed under the License is distributed on an "AS IS" BASIS, */ +/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ +/* implied. See the License for the specific language governing */ +/* permissions and limitations under the License. */ +/* */ +/* IBM_PROLOG_END_TAG */ +#ifndef ERRL_UDATTRIBUTEP_H +#define ERRL_UDATTRIBUTEP_H + +/** + * Defines the classes that allow you to parse attribute data + * that was previously saved to an error log with + * ERRORLOG::ErrlUserDetailsAttribute. + */ + +#include "errluserdetails.H" + +// Pull in the auto-generated portion for the parser +// Created by xmltohb.pl +#include <errludattributeP_gen.H> + + +#endif // ERRL_UDATTRIBUTEP_H diff --git a/src/usr/errl/plugins/errludparserfactoryerrl.H b/src/usr/errl/plugins/errludparserfactoryerrl.H index fbefe231f..d5999c807 100644 --- a/src/usr/errl/plugins/errludparserfactoryerrl.H +++ b/src/usr/errl/plugins/errludparserfactoryerrl.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2018 */ +/* Contributors Listed Below - COPYRIGHT 2012,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -34,7 +34,7 @@ #include "errludstring.H" #include "errludtarget.H" #include "errludbacktrace.H" -#include "errludattribute.H" +#include "errludattributeP.H" #include "errludlogregister.H" #include "errludcallout.H" #include "errludsensor.H" 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) |