From 4ea62ca340c8da822515bb4cac7d9bda3c19efa8 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Fri, 11 Dec 2015 17:04:13 -0600 Subject: Resolve FSP build issues from P9 work. - Disable PRDF error log parser since it is not currently generated in hostboot. - Disable HWPF error log parser since it is deprecated and doesn't compile. Change-Id: Ic3639fadd345ad816d403a09881a35b761bf3376 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22709 Tested-by: Jenkins Server Reviewed-by: Elizabeth Liner Reviewed-by: WILLIAM G. HOFFA Reviewed-by: A. Patrick Williams III --- src/usr/errl/parser/genErrlParsers.pl | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'src/usr/errl') diff --git a/src/usr/errl/parser/genErrlParsers.pl b/src/usr/errl/parser/genErrlParsers.pl index fde5799a5..502397aba 100755 --- a/src/usr/errl/parser/genErrlParsers.pl +++ b/src/usr/errl/parser/genErrlParsers.pl @@ -6,7 +6,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2013,2014 +# Contributors Listed Below - COPYRIGHT 2013,2015 # [+] Google Inc. # [+] International Business Machines Corp. # @@ -983,15 +983,17 @@ print OFILE "\#\n"; print OFILE "CFLAGS += -DPARSER\n\n"; print OFILE "EXPLIBS =\n\n"; -print OFILE "\#-------------------------------------------------------------\n"; -print OFILE "\# Call PRD makefile for prdf plugins\n"; -print OFILE "\#-------------------------------------------------------------\n"; -print OFILE ".if ( \$(CONTEXT) != \"x86.nfp\" )\n"; -print OFILE "EXPLIB_SUBDIRS += prdf\n"; -print OFILE "EXPSHLIB_SUBDIRS += prdf\n"; -print OFILE ".else\n"; -print OFILE "EXPLIB_SUBDIRS += prdf\n"; -print OFILE ".endif\n"; +# TODO: RTC 135217 +# Disable PRD error log plugins until we enable compile of PRD. +#print OFILE "\#-------------------------------------------------------------\n"; +#print OFILE "\# Call PRD makefile for prdf plugins\n"; +#print OFILE "\#-------------------------------------------------------------\n"; +#print OFILE ".if ( \$(CONTEXT) != \"x86.nfp\" )\n"; +#print OFILE "EXPLIB_SUBDIRS += prdf\n"; +#print OFILE "EXPSHLIB_SUBDIRS += prdf\n"; +#print OFILE ".else\n"; +#print OFILE "EXPLIB_SUBDIRS += prdf\n"; +#print OFILE ".endif\n"; print OFILE "\#-------------------------------------------------------------\n"; print OFILE "\# SRC Parsers\n"; @@ -1228,7 +1230,9 @@ sub getPluginDirsToParse if ($dirEntryPath =~ /plugins/) { # Found plugins directory - push(@pluginDirsToParse, $dirEntryPath); + push(@pluginDirsToParse, $dirEntryPath) + if (!($dirEntryPath =~ /hwpf/)); + # TODO RTC 124673 disable fapi1 } else { -- cgit v1.2.3