remove host@%d-on from config options
As noted in earlier reviews, this is not a configurable option.
Multiple service files throughout OpenBMC have hard coded this path
within themselves.
Make this a hard coded variable instead within meson so that it can be
utilized across multiple phosphor-state-manager applications.
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I43a32824f6e6788dc8db8ba76a23989b9f5254d2
diff --git a/meson.build b/meson.build
index 53df188..931136f 100644
--- a/meson.build
+++ b/meson.build
@@ -28,8 +28,6 @@
conf.set_quoted(
'BMC_OBJPATH', get_option('bmc-objpath'))
conf.set_quoted(
- 'HOST_RUNNING_FILE', get_option('host-running-file'))
-conf.set_quoted(
'HOST_STATE_PERSIST_PATH', get_option('host-state-persist-path'))
conf.set_quoted(
'POH_COUNTER_PERSIST_PATH', get_option('poh-counter-persist-path'))
@@ -44,6 +42,10 @@
conf.set(
'CLASS_VERSION', get_option('class-version'))
+# globals shared across applications
+conf.set_quoted(
+ 'HOST_RUNNING_FILE', '/run/openbmc/host@%d-on')
+
configure_file(output: 'config.h', configuration: conf)
if(get_option('warm-reboot').enabled())
diff --git a/meson_options.txt b/meson_options.txt
index d340668..33fe793 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -49,12 +49,6 @@
)
option(
- 'host-running-file', type: 'string',
- value: '/run/openbmc/host@%d-on',
- description: 'File to create if host is running.',
-)
-
-option(
'host-state-persist-path', type: 'string',
value: '/var/lib/phosphor-state-manager/requestedHostTransition',
description: 'Path of file for storing requested host state.',