Remove declared DBus variables from meson
For defined DBus variables (eg: DBus name, DBus object path),
we prefer to define them in the code rather than in the meson file
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I7c08461e297f4e0da9ae521e0228ed7ff89a4d47
diff --git a/manager/json-parser.hpp b/manager/json-parser.hpp
index 28ffe4d..e7e102f 100644
--- a/manager/json-parser.hpp
+++ b/manager/json-parser.hpp
@@ -21,6 +21,8 @@
using PriorityMap =
std::unordered_map<std::string, phosphor::led::Layout::Action>;
+static constexpr auto ledGroups = "/xyz/openbmc_project/led/groups";
+
/** @brief Parse LED JSON file and output Json object
*
* @param[in] path - path of LED JSON file
@@ -110,7 +112,7 @@
for (const auto& entry : leds)
{
- fs::path tmpPath(std::string{OBJPATH});
+ fs::path tmpPath(std::string{ledGroups});
tmpPath /= entry.value("group", "");
auto objpath = tmpPath.string();
auto members = entry.value("members", empty);
diff --git a/manager/led-main.cpp b/manager/led-main.cpp
index b589bc0..5182523 100644
--- a/manager/led-main.cpp
+++ b/manager/led-main.cpp
@@ -45,7 +45,7 @@
phosphor::led::Manager manager(bus, systemLedMap);
/** @brief sd_bus object manager */
- sdbusplus::server::manager_t objManager(bus, OBJPATH);
+ sdbusplus::server::manager_t objManager(bus, ledGroups);
/** @brief vector of led groups */
std::vector<std::unique_ptr<phosphor::led::Group>> groups;
@@ -79,7 +79,7 @@
bus.attach_event(event.get(), SD_EVENT_PRIORITY_NORMAL);
/** @brief Claim the bus */
- bus.request_name(BUSNAME);
+ bus.request_name("xyz.openbmc_project.LED.GroupManager");
event.loop();
return 0;