commit 1a1dfbd29fd4bba2ecf6fe2102d9e2fd61dd32af
author Arun Lal K M <arun.lal@intel.com> Tue Jan 17 06:38:19 2023 +0000
committer Arun Lal K M <arun.lal@intel.com> Tue Jan 17 08:48:17 2023 +0000
tree 288d1d94b7432e9ac42ce7205a6d65a8688fe64b
parent d0f034a2c8a15a380f80980d791d62476a78fdb2

Make BiosConfig run as one service.

As of now BiosConfig runs in two service as seen below.
1) xyz.openbmc_project.biosconfig_manager.service
busctl tree xyz.openbmc_project.BIOSConfigManager
`-/xyz
  `-/xyz/openbmc_project
    `-/xyz/openbmc_project/bios_config
      `-/xyz/openbmc_project/bios_config/manager

2) xyz.openbmc_project.biosconfig_password.service
busctl tree xyz.openbmc_project.BIOSConfigPassword
`-/xyz
  `-/xyz/openbmc_project
    `-/xyz/openbmc_project/bios_config
      `-/xyz/openbmc_project/bios_config/password

The code changes are to move functionalities of
xyz.openbmc_project.biosconfig_password.service to
xyz.openbmc_project.biosconfig_manager.service as
shown below

busctl tree xyz.openbmc_project.BIOSConfigManager
`-/xyz
  `-/xyz/openbmc_project
    `-/xyz/openbmc_project/bios_config
      |-/xyz/openbmc_project/bios_config/manager
      `-/xyz/openbmc_project/bios_config/password

Tested:
Made sure BiosConfig functionality is not affected.
Note that calls from bmcweb will now require to use
service as xyz.openbmc_project.biosconfig_manager.service

Change-Id: I8adeb57ed3758041b2b9b0d1ddc714e418c4484e
Signed-off-by: Arun Lal K M <arun.lal@intel.com>

meson.build

diff --git a/meson.build b/meson.build
index 9f9c057..87b2ec3 100755
--- a/meson.build
+++ b/meson.build
@@ -37,24 +37,20 @@
         dependency('openssl'),
 ]
 
-executable('biosconfig-manager',
-           'src/manager.cpp',
-           'src/manager_serialize.cpp',
-        implicit_include_directories: true,
-        include_directories: ['include'],
-        dependencies: deps,
-        cpp_args : boost_args,
-        install: true,
-        install_dir: get_option('bindir'))
+src_files = ['src/main.cpp',
+             'src/manager.cpp',
+             'src/manager_serialize.cpp',
+             'src/password.cpp'
+]
 
-executable('biosconfig-password',
-           'src/password.cpp',
-        implicit_include_directories: true,
-        include_directories: ['include'],
-        dependencies: deps,
-        cpp_args : boost_args,
-        install: true,
-        install_dir: get_option('bindir'))
+executable('biosconfig-manager',
+           src_files,
+           implicit_include_directories: true,
+           include_directories: ['include'],
+           dependencies: deps,
+           cpp_args : boost_args,
+           install: true,
+           install_dir: get_option('bindir'))
 
 systemd = dependency('systemd')
 systemd_system_unit_dir = systemd.get_variable(
@@ -68,11 +64,3 @@
     install_dir: systemd_system_unit_dir,
     output: 'xyz.openbmc_project.biosconfig_manager.service'
 )
-
-configure_file(
-    copy: true,
-    input: 'service_files/xyz.openbmc_project.biosconfig_password.service',
-    install: true,
-    install_dir: systemd_system_unit_dir,
-    output: 'xyz.openbmc_project.biosconfig_password.service'
-)
\ No newline at end of file