remove meson.options

The only option in this repository is configuring the location
of the persistent file location.  This is not ever leveraged
by anyone.  Reduce the complexity of maintaining a meson.option
to hold a string and just move it to a constant in a header.

Change-Id: I066d88d2831d1d04fd53b47e26cd6fbcabf863d2
Signed-off-by: Patrick Williams <[email protected]>

Author: williamspatrick

include/config.hpp

@@ -0,0 +1,3 @@
+#pragma once
+
+static constexpr auto BIOS_PERSIST_PATH = "/var/lib/bios-settings-manager";

include/manager.hpp

@@ -15,8 +15,6 @@
 */
 #pragma once
 
-#include "config.h"
-
 #include <sdbusplus/asio/object_server.hpp>
 #include <sdbusplus/server.hpp>
 #include <xyz/openbmc_project/BIOSConfig/Manager/server.hpp>
@@ -79,7 +77,8 @@ class Manager : public Base
      *  @param[in] systemBus - bus connection
      */
     Manager(sdbusplus::asio::object_server& objectServer,
-            std::shared_ptr<sdbusplus::asio::connection>& systemBus);
+            std::shared_ptr<sdbusplus::asio::connection>& systemBus,
+            std::string persistPath);
 
     /** @brief Set the BIOS attribute with a new value, the new value is added
      *         to the PendingAttribute.

include/password.hpp

@@ -14,8 +14,6 @@
 // limitations under the License.
 */
 #pragma once
-#include "config.h"
-
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
 #include <openssl/sha.h>

meson.build

@@ -18,10 +18,6 @@ project(
 # project uses the same compiler, we can safely ignmore these info notes.
 add_project_arguments('-Wno-psabi', language: 'cpp')
 
-conf_data = configuration_data()
-conf_data.set_quoted('BIOS_PERSIST_PATH', get_option('bios-persist-path'))
-configure_file(output: 'config.h', configuration: conf_data)
-
 boost_args = [
     '-DBOOST_ALL_NO_LIB',
     '-DBOOST_ASIO_DISABLE_THREADS',

meson.options

@@ -14,6 +14,7 @@
 // limitations under the License.
 */
 
+#include "config.hpp"
 #include "manager.hpp"
 #include "password.hpp"
 
@@ -38,7 +39,7 @@ int main()
      * Object path : /xyz/openbmc_project/bios_config/manager
      * Interface : xyz.openbmc_project.BIOSConfig.Manager
      */
-    bios_config::Manager manager(objectServer, systemBus);
+    bios_config::Manager manager(objectServer, systemBus, BIOS_PERSIST_PATH);
 
     /**
      * Password class is responsible for handling methods and signals under

src/main.cpp

@@ -311,12 +311,13 @@ Manager::PendingAttributes Manager::pendingAttributes(PendingAttributes value)
 }
 
 Manager::Manager(sdbusplus::asio::object_server& objectServer,
-                 std::shared_ptr<sdbusplus::asio::connection>& systemBus) :
+                 std::shared_ptr<sdbusplus::asio::connection>& systemBus,
+                 std::string persistPath) :
     sdbusplus::xyz::openbmc_project::BIOSConfig::server::Manager(
         *systemBus, objectPath),
     objServer(objectServer), systemBus(systemBus)
 {
-    fs::path biosDir(BIOS_PERSIST_PATH);
+    fs::path biosDir(persistPath);
     fs::create_directories(biosDir);
     biosFile = biosDir / biosPersistFile;
     deserialize(biosFile, *this);

src/manager.cpp

@@ -15,6 +15,7 @@
 */
 #include "password.hpp"
 
+#include "config.hpp"
 #include "xyz/openbmc_project/BIOSConfig/Common/error.hpp"
 #include "xyz/openbmc_project/Common/error.hpp"