Move OpenPOWER specific dump configurations to extension
Move the configuration options for OpenPOWER specific dumps
to the respective extension directory.
Signed-off-by: Dhruvaraj Subhashchandran <dhruvaraj@in.ibm.com>
Change-Id: I8610de2d0982541110bebfbfda24bebdbdf70748
diff --git a/dump-extensions/openpower-dumps/dump-extensions.cpp b/dump-extensions/openpower-dumps/dump-extensions.cpp
index ed5956f..b47ba55 100644
--- a/dump-extensions/openpower-dumps/dump-extensions.cpp
+++ b/dump-extensions/openpower-dumps/dump-extensions.cpp
@@ -2,6 +2,8 @@
#include "dump-extensions.hpp"
+#include "dump-extensions/openpower-dumps/openpower_dumps_config.h"
+
#include "dump_manager_resource.hpp"
#include "dump_manager_system.hpp"
diff --git a/dump-extensions/openpower-dumps/meson.build b/dump-extensions/openpower-dumps/meson.build
index efb1124..f2e3c23 100644
--- a/dump-extensions/openpower-dumps/meson.build
+++ b/dump-extensions/openpower-dumps/meson.build
@@ -1,5 +1,25 @@
# SPDX-License-Identifier: Apache-2.0
+# Configuration header file(openpower_dumps_config.h) generation
+opconf_data = configuration_data()
+
+opconf_data.set_quoted('SYSTEM_DUMP_OBJPATH', get_option('SYSTEM_DUMP_OBJPATH'),
+ description : 'The system dump manager D-Bus path'
+ )
+opconf_data.set_quoted('SYSTEM_DUMP_OBJ_ENTRY', get_option('SYSTEM_DUMP_OBJ_ENTRY'),
+ description : 'The system dump entry D-Bus object path'
+ )
+
+opconf_data.set_quoted('RESOURCE_DUMP_OBJPATH', get_option('RESOURCE_DUMP_OBJPATH'),
+ description : 'The resource dump manager D-Bus path'
+ )
+opconf_data.set_quoted('RESOURCE_DUMP_OBJ_ENTRY', get_option('RESOURCE_DUMP_OBJ_ENTRY'),
+ description : 'The resource dump entry D-Bus object path'
+ )
+configure_file(configuration : opconf_data,
+ output : 'openpower_dumps_config.h'
+ )
+
phosphor_dump_manager_sources += [
'dump-extensions/openpower-dumps/dump-extensions.cpp',
'dump-extensions/openpower-dumps/dump_manager_system.cpp',
diff --git a/meson.build b/meson.build
index 3ef697a..2eb51d3 100644
--- a/meson.build
+++ b/meson.build
@@ -76,24 +76,12 @@
conf_data.set_quoted('BMC_DUMP_OBJPATH', get_option('BMC_DUMP_OBJPATH'),
description : 'The BMC Dump manager Dbus path'
)
-conf_data.set_quoted('SYSTEM_DUMP_OBJPATH', get_option('SYSTEM_DUMP_OBJPATH'),
- description : 'The system Dump manager Dbus path'
- )
-conf_data.set_quoted('RESOURCE_DUMP_OBJPATH', get_option('RESOURCE_DUMP_OBJPATH'),
- description : 'The resource Dump manager Dbus path'
- )
conf_data.set_quoted('CORE_FILE_DIR', get_option('CORE_FILE_DIR'),
description : 'Directory where core dumps are placed'
)
conf_data.set_quoted('OBJ_INTERNAL', get_option('OBJ_INTERNAL'),
description : 'Internal Dump manager Dbus object path'
)
-conf_data.set_quoted('SYSTEM_DUMP_OBJ_ENTRY', get_option('SYSTEM_DUMP_OBJ_ENTRY'),
- description : 'The system dump entry DBus object path'
- )
-conf_data.set_quoted('RESOURCE_DUMP_OBJ_ENTRY', get_option('RESOURCE_DUMP_OBJ_ENTRY'),
- description : 'The resource dump entry DBus object path'
- )
conf_data.set_quoted('BMC_DUMP_OBJ_ENTRY', get_option('BMC_DUMP_OBJ_ENTRY'),
description : 'The BMC dump entry DBus object path'
)
diff --git a/meson_options.txt b/meson_options.txt
index 4bcf664..a4788f9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -8,27 +8,17 @@
option('DUMP_BUSNAME', type : 'string',
value : 'xyz.openbmc_project.Dump.Manager',
- description : 'The Dbus busname to own'
+ description : 'The D-Bus busname to own'
)
option('DUMP_OBJPATH', type : 'string',
value : '/xyz/openbmc_project/dump',
- description : 'The Dump manager Dbus root'
+ description : 'The dump manager D-Bus root'
)
option('BMC_DUMP_OBJPATH', type : 'string',
value : '/xyz/openbmc_project/dump/bmc',
- description : 'The BMC Dump manager Dbus object path'
- )
-
-option('SYSTEM_DUMP_OBJPATH', type : 'string',
- value : '/xyz/openbmc_project/dump/system',
- description : 'The system Dump manager Dbus object path'
- )
-
-option('RESOURCE_DUMP_OBJPATH', type : 'string',
- value : '/xyz/openbmc_project/dump/resource',
- description : 'The resource dump manager Dbus object path'
+ description : 'The BMC dump manager D-Bus object path'
)
option('CORE_FILE_DIR', type : 'string',
@@ -38,22 +28,12 @@
option('OBJ_INTERNAL', type : 'string',
value : '/xyz/openbmc_project/dump/internal/manager',
- description : 'Internal Dump manager Dbus object path'
+ description : 'Internal dump manager D-Bus object path'
)
option('BMC_DUMP_OBJ_ENTRY', type : 'string',
value : '/xyz/openbmc_project/dump/bmc/entry',
- description : 'The BMC dump entry DBus object path'
- )
-
-option('SYSTEM_DUMP_OBJ_ENTRY', type : 'string',
- value : '/xyz/openbmc_project/dump/system/entry',
- description : 'The system dump entry DBus object path'
- )
-
-option('RESOURCE_DUMP_OBJ_ENTRY', type : 'string',
- value : '/xyz/openbmc_project/dump/resource/entry',
- description : 'The resource dump entry DBus object path'
+ description : 'The BMC dump entry D-Bus object path'
)
option('BMC_DUMP_PATH', type : 'string',
@@ -104,3 +84,29 @@
value : 'disabled',
description : 'Enable Open Power specific dumps'
)
+
+# Configurations for openpower-dump extension
+
+# System dump options
+
+option('SYSTEM_DUMP_OBJPATH', type : 'string',
+ value : '/xyz/openbmc_project/dump/system',
+ description : 'The system dump manager D-Bus object path'
+ )
+
+option('SYSTEM_DUMP_OBJ_ENTRY', type : 'string',
+ value : '/xyz/openbmc_project/dump/system/entry',
+ description : 'The system dump entry D-Bus object path'
+ )
+
+# Resource dump options
+
+option('RESOURCE_DUMP_OBJPATH', type : 'string',
+ value : '/xyz/openbmc_project/dump/resource',
+ description : 'The resource dump manager D-Bus object path'
+ )
+
+option('RESOURCE_DUMP_OBJ_ENTRY', type : 'string',
+ value : '/xyz/openbmc_project/dump/resource/entry',
+ description : 'The resource dump entry D-Bus object path'
+ )