summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Horton <brianh@linux.ibm.com>2013-03-15 15:19:03 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-03-15 16:18:07 -0500
commita7314b2c07f766aa4d1890a1c80cbe01f7a98b32 (patch)
tree1122446ebc992485ae8525dca2dfc4fd37bbde43
parent74ac56cc753d903dce8d7515e88f4a2880637c4c (diff)
downloadtalos-hostboot-a7314b2c07f766aa4d1890a1c80cbe01f7a98b32.tar.gz
talos-hostboot-a7314b2c07f766aa4d1890a1c80cbe01f7a98b32.zip
fix fsp build break due to errlud changes.
Change-Id: I7bda37d71a9b987c028869b5a4f21052a65fb73b Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3593 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rw-r--r--src/usr/targeting/common/xmltohb/common.mk4
-rwxr-xr-xsrc/usr/targeting/common/xmltohb/xmltohb.pl11
-rw-r--r--src/usr/targeting/xmltohb/makefile5
3 files changed, 7 insertions, 13 deletions
diff --git a/src/usr/targeting/common/xmltohb/common.mk b/src/usr/targeting/common/xmltohb/common.mk
index 32fa3f67e..db772c7e6 100644
--- a/src/usr/targeting/common/xmltohb/common.mk
+++ b/src/usr/targeting/common/xmltohb/common.mk
@@ -35,9 +35,7 @@ XMLTOHB_HEADER_TARGETS = \
attributetraits.H \
attributestructs.H \
pnortargeting.H \
- fapiplatattrmacros.H \
- plugins/errludattribute.H \
- plugins/errludtarget.H
+ fapiplatattrmacros.H
XMLTOHB_SOURCE_TARGETS = \
attributestrings.C \
diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl
index 6be3ddb3f..eb9a39625 100755
--- a/src/usr/targeting/common/xmltohb/xmltohb.pl
+++ b/src/usr/targeting/common/xmltohb/xmltohb.pl
@@ -206,35 +206,36 @@ if( !($cfgSrcOutputDir =~ "none") )
#fixme-Remove when RTC:38197 is done
open(ATTR_DUMP_FILE,">$cfgSrcOutputDir"."attributedump.C")
or fatal ("Attribute dump file: \"$cfgSrcOutputDir"
- . "attributedump.C\" could not be opened.");
+ . "attributedump.C\" could not be opened.");
my $dumpFile = *ATTR_DUMP_FILE;
writeDumpFile($attributes,$dumpFile);
close $dumpFile;
open(ATTR_ATTRERRL_C_FILE,">$cfgSrcOutputDir"."errludattribute.C")
or fatal ("Attribute errlog C file: \"$cfgSrcOutputDir"
- . "errludattribute.C\" could not be opened.");
+ . "errludattribute.C\" could not be opened.");
my $attrErrlCFile = *ATTR_ATTRERRL_C_FILE;
writeAttrErrlCFile($attributes,$attrErrlCFile);
close $attrErrlCFile;
+ mkdir("$cfgSrcOutputDir/errl");
open(ATTR_ATTRERRL_H_FILE,">$cfgSrcOutputDir"."errl/errludattribute.H")
or fatal ("Attribute errlog H file: \"$cfgSrcOutputDir"
- . "errl/errludattribute.H\" could not be opened.");
+ . "errl/errludattribute.H\" could not be opened.");
my $attrErrlHFile = *ATTR_ATTRERRL_H_FILE;
writeAttrErrlHFile($attributes,$attrErrlHFile);
close $attrErrlHFile;
open(ATTR_TARGETERRL_C_FILE,">$cfgSrcOutputDir"."errludtarget.C")
or fatal ("Target errlog C file: \"$cfgSrcOutputDir"
- . "errludtarget.C\" could not be opened.");
+ . "errludtarget.C\" could not be opened.");
my $targetErrlCFile = *ATTR_TARGETERRL_C_FILE;
writeTargetErrlCFile($attributes,$targetErrlCFile);
close $targetErrlCFile;
open(ATTR_TARGETERRL_H_FILE,">$cfgSrcOutputDir"."errl/errludtarget.H")
or fatal ("Target errlog H file: \"$cfgSrcOutputDir"
- . "errl/errludtarget.H\" could not be opened.");
+ . "errl/errludtarget.H\" could not be opened.");
my $targetErrlHFile = *ATTR_TARGETERRL_H_FILE;
writeTargetErrlHFile($attributes,$targetErrlHFile);
close $targetErrlHFile;
diff --git a/src/usr/targeting/xmltohb/makefile b/src/usr/targeting/xmltohb/makefile
index f233103b7..8ce66479b 100644
--- a/src/usr/targeting/xmltohb/makefile
+++ b/src/usr/targeting/xmltohb/makefile
@@ -101,11 +101,6 @@ CLEAN_TARGETS += $(addprefix $(GENDIR)/, ${XMLTOHB_SYSTEM_BINARIES}) \
GENDIR_ERRL = $(ROOTPATH)/obj/genfiles/errl
-.PHONY: make_gendir_errl
-make_gendir_errl:
- @mkdir -p $(GENDIR_ERRL)
-GEN_PASS_PRE += make_gendir_errl
-
XMLTOHB_RAN_INDICATION = $(GENDIR)/.called_xmltohb_compiler
CLEAN_TARGETS += $(XMLTOHB_RAN_INDICATION)
OpenPOWER on IntegriCloud