Renamed error yaml due to clash with error yaml in openpower-dbus
To fix duplicate "Event" string in error message ""Message":
"org.open_power.Error.Host.Event.Event"", renamed error yaml
in dbus interfaces from org/open_power/Host/Event.errors.yaml
to org/open_power/Host.errors.yaml.
Renaming of error yaml file in dbus interfaces clashes with the
error yaml file name in openpower-debug-collector.
To fix the clash renaming openpower-debug-collector error yaml from
org/open_power/Host.errors.yaml to org/open_power/Host/Boot.errors.yaml
Change-Id: Ib5fc0cd176b5d9dc2f47f35b008277434855a711
Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>
diff --git a/Makefile.am b/Makefile.am
index 8fa2de3..dc0ddbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
watchdog_timeout
nobase_nodist_include_HEADERS = \
- org/open_power/Host/error.hpp
+ org/open_power/Host/Boot/error.hpp
if GEN_ERRORS
nobase_nodist_include_HEADERS += \
@@ -13,8 +13,8 @@
endif
BUILT_SOURCES = \
- org/open_power/Host/error.cpp \
- org/open_power/Host/error.hpp
+ org/open_power/Host/Boot/error.cpp \
+ org/open_power/Host/Boot/error.hpp
if GEN_ERRORS
BUILT_SOURCES += phosphor-logging/elog-errors.hpp
@@ -23,10 +23,10 @@
CLEANFILES = ${BUILT_SOURCES}
checkstop_app_SOURCES = checkstop_app.cpp \
- org/open_power/Host/error.cpp
+ org/open_power/Host/Boot/error.cpp
watchdog_timeout_SOURCES = watchdog_timeout.cpp \
- org/open_power/Host/error.cpp
+ org/open_power/Host/Boot/error.cpp
generic_ldflags = \
$(PHOSPHOR_LOGGING_LIBS) \
@@ -42,19 +42,19 @@
checkstop_app_CXXFLAGS = ${generic_cxxflags}
watchdog_timeout_CXXFLAGS = ${generic_cxxflags}
-org/open_power/Host/error.hpp: ${top_srcdir}/org/open_power/Host.errors.yaml
+org/open_power/Host/Boot/error.hpp: ${top_srcdir}/org/open_power/Host/Boot.errors.yaml
@mkdir -p `dirname $@`
- $(SDBUSPLUSPLUS) -r $(srcdir) error exception-header org.open_power.Host > $@
+ $(SDBUSPLUSPLUS) -r $(srcdir) error exception-header org.open_power.Host.Boot> $@
-org/open_power/Host/error.cpp: ${top_srcdir}/org/open_power/Host.errors.yaml
+org/open_power/Host/Boot/error.cpp: ${top_srcdir}/org/open_power/Host/Boot.errors.yaml
@mkdir -p `dirname $@`
- $(SDBUSPLUSPLUS) -r $(srcdir) error exception-cpp org.open_power.Host > $@
+ $(SDBUSPLUSPLUS) -r $(srcdir) error exception-cpp org.open_power.Host.Boot> $@
endif
# Export error YAML to shared location
yamldir = ${datadir}/phosphor-dbus-yaml/yaml
nobase_yaml_DATA = \
- org/open_power/Host.errors.yaml
+ org/open_power/Host/Boot.errors.yaml
# Generate phosphor-logging/elog-errors.hpp
if GEN_ERRORS
@@ -64,8 +64,8 @@
ELOG_MAKO_DIR ?= ${ELOG_DIR}/tools/phosphor-logging/templates/
YAML_DIR ?= ${OECORE_NATIVE_SYSROOT}${datadir}/phosphor-dbus-yaml/yaml
phosphor-logging/elog-errors.hpp:
- @mkdir -p ${YAML_DIR}/org/open_power/
- @cp ${top_srcdir}/org/open_power/Host.errors.yaml ${YAML_DIR}/org/open_power/Host.errors.yaml
+ @mkdir -p ${YAML_DIR}/org/open_power/Host
+ @cp ${top_srcdir}/org/open_power/Host/Boot.errors.yaml ${YAML_DIR}/org/open_power/Host/Boot.errors.yaml
@mkdir -p `dirname $@`
@chmod 777 $(ELOG_GEN_DIR)/elog-gen.py
$(AM_V_at)$(PYTHON) $(ELOG_GEN_DIR)/elog-gen.py -y ${YAML_DIR} -t ${ELOG_MAKO_DIR} -m ${ELOG_MAKO} -o $@
diff --git a/checkstop_app.cpp b/checkstop_app.cpp
index b9510c2..2ecc45b 100644
--- a/checkstop_app.cpp
+++ b/checkstop_app.cpp
@@ -1,11 +1,11 @@
#include <phosphor-logging/elog.hpp>
#include "phosphor-logging/elog-errors.hpp"
-#include "org/open_power/Host/error.hpp"
+#include "org/open_power/Host/Boot/error.hpp"
int main(int argc, char* argv[])
{
using namespace phosphor::logging;
- using error = sdbusplus::org::open_power::Host::Error::Checkstop;
+ using error = sdbusplus::org::open_power::Host::Boot::Error::Checkstop;
report<error>();
return 0;
diff --git a/org/open_power/Host.errors.yaml b/org/open_power/Host/Boot.errors.yaml
similarity index 100%
rename from org/open_power/Host.errors.yaml
rename to org/open_power/Host/Boot.errors.yaml
diff --git a/watchdog_timeout.cpp b/watchdog_timeout.cpp
index bb0d4bc..d6a267a 100644
--- a/watchdog_timeout.cpp
+++ b/watchdog_timeout.cpp
@@ -1,11 +1,11 @@
#include <phosphor-logging/elog.hpp>
#include "phosphor-logging/elog-errors.hpp"
-#include "org/open_power/Host/error.hpp"
+#include "org/open_power/Host/Boot/error.hpp"
int main(int argc, char* argv[])
{
using namespace phosphor::logging;
- using error = sdbusplus::org::open_power::Host::Error::WatchdogTimedOut;
+ using error = sdbusplus::org::open_power::Host::Boot::Error::WatchdogTimedOut;
report<error>();
return 0;