| commit | 01cec99323890e1759bac54d2a81b59e15624dcc | [log] [tgz] |
|---|---|---|
| author | Patrick Williams <patrick@stwcx.xyz> | Sat Apr 19 12:39:38 2025 -0400 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Mon Apr 21 11:02:14 2025 -0400 |
| tree | 4a61f26d754965d2575361b02cd5bad30086773c | |
| parent | 7292aeca7f15f140d6cf596ac5593d684bef2be8 [diff] |
phosphor-software-manager: move to libexec Non-user executables are suppose to be installed into libexec[1]. [1]: https://github.com/openbmc/docs/blob/master/anti-patterns.md#incorrect-placement-of-executables-in-sbin-usrsbin-or-bin-usrbin Tested: ``` $ meson install -C builddir --destdir /tmp/phosphor-bmc-code-mgmt $ find /tmp/phosphor-bmc-code-mgmt/ -name phosphor-software-manager /tmp/phosphor-bmc-code-mgmt/usr/local/libexec/phosphor-bmc-code-mgmt/phosphor-software-manager ``` Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Change-Id: I881b7d7eb8c773d1f2e7feb5bef34673029ae91d
diff --git a/bmc/meson.build b/bmc/meson.build index 930bd0c..af7cc74 100644 --- a/bmc/meson.build +++ b/bmc/meson.build
@@ -201,6 +201,7 @@ software_common_sources, dependencies: [deps, ssl], install: true, + install_dir: get_option('libexecdir') / 'phosphor-code-mgmt', ) unit_files += ['xyz.openbmc_project.Software.Manager.service.in'] else
diff --git a/bmc/xyz.openbmc_project.Software.Manager.service.in b/bmc/xyz.openbmc_project.Software.Manager.service.in index f41d248..213b1be 100644 --- a/bmc/xyz.openbmc_project.Software.Manager.service.in +++ b/bmc/xyz.openbmc_project.Software.Manager.service.in
@@ -3,7 +3,7 @@ [Service] ExecStartPre=/bin/sh -c 'mkdir -p /tmp/images' -ExecStart=/usr/bin/phosphor-software-manager +ExecStart=/usr/libexec/phosphor-code-mgmt/phosphor-software-manager Restart=always Type=dbus BusName={BUSNAME}