disable service files for Updater and Version
Add the service files for Updater and Version manager only if the
software-update-dbus-interface meson option is disabled. These services
will be replaced by new Software.Manager service.
Tested -
```
> curl -k -H "X-Auth-Token: $token" -H "Content-Type:multipart/form-data" -X POST -F UpdateParameters="{\"Targets\":[\"/redfish/v1/UpdateService/FirmwareInventory/a79d71e4\"],\"@Redfish.OperationApplyTime\":\"OnReset\"};type=application/json" -F "UpdateFile=@obmc-phosphor-image-romulus-20241015174416.static.mtd.tar;type=application/octet-stream" https://${bmc}/redfish/v1/UpdateService/update
{
"@odata.id": "/redfish/v1/TaskService/Tasks/0",
"@odata.type": "#Task.v1_4_3.Task",
"Id": "0",
"TaskState": "Running",
"TaskStatus": "OK"
}
> systemctl status xyz.openbmc_project.Software.Manager
* xyz.openbmc_project.Software.Manager.service - Phosphor Software Manager
Loaded: loaded (/usr/lib/systemd/system/xyz.openbmc_project.Software.Manager.service; enabled; preset: enabled)
Active: active (running) since Thu 2024-11-14 00:54:43 UTC; 2min 8s ago
Process: 272 ExecStartPre=/bin/sh -c mkdir -p /tmp/images (code=exited, status=0/SUCCESS)
Main PID: 290 (phosphor-softwa)
CPU: 995ms
CGroup: /system.slice/xyz.openbmc_project.Software.Manager.service
`-290 /usr/bin/phosphor-software-manager
Nov 14 00:54:11 romulus systemd[1]: Starting Phosphor Software Manager...
Nov 14 00:54:22 romulus phosphor-software-manager[290]: Creating Software Manager
Nov 14 00:54:43 romulus systemd[1]: Started Phosphor Software Manager.
> systemctl status xyz.openbmc_project.Software.Version.service
* xyz.openbmc_project.Software.Version.service - Phosphor Version Software Manager
Loaded: loaded (/usr/lib/systemd/system/xyz.openbmc_project.Software.Version.service; enabled; preset: enabled)
Active: active (running) since Thu 2024-11-14 01:35:19 UTC; 38s ago
Process: 345 ExecStartPre=/bin/sh -c mkdir -p /tmp/images (code=exited, status=0/SUCCESS)
Main PID: 350 (phosphor-versio)
CPU: 391ms
CGroup: /system.slice/xyz.openbmc_project.Software.Version.service
`-350 /usr/bin/phosphor-version-software-manager
Nov 14 01:35:10 romulus systemd[1]: Starting Phosphor Version Software Manager...
Nov 14 01:35:19 romulus systemd[1]: Started Phosphor Version Software Manager.
> systemctl status xyz.openbmc_project.Software.BMC.Updater.service
* xyz.openbmc_project.Software.BMC.Updater.service - OpenBMC Software Update Manager
Loaded: loaded (/usr/lib/systemd/system/xyz.openbmc_project.Software.BMC.Updater.service; enabled; preset: enabled)
Drop-In: /usr/lib/systemd/system/xyz.openbmc_project.Software.BMC.Updater.service.d
`-software-bmc-updater.conf
Active: active (running) since Thu 2024-11-14 01:35:00 UTC; 1min 20s ago
Main PID: 271 (phosphor-image-)
CPU: 825ms
CGroup: /system.slice/xyz.openbmc_project.Software.BMC.Updater.service
`-271 /usr/bin/phosphor-image-updater
Nov 14 01:34:42 romulus systemd[1]: Starting OpenBMC Software Update Manager...
> systemctl status xyz.openbmc_project.Software.Manager.service
Unit xyz.openbmc_project.Software.Manager.service could not be found.
```
Change-Id: I67b40d18fce6e5a67d6fad9a5e3c7a0c74cd11aa
Signed-off-by: Jagpal Singh Gill <paligill@gmail.com>
diff --git a/meson.build b/meson.build
index 3158f5f..b697e40 100644
--- a/meson.build
+++ b/meson.build
@@ -148,10 +148,8 @@
'reboot-guard-enable.service.in',
'force-reboot.service.in',
'usr-local.mount.in',
- 'xyz.openbmc_project.Software.BMC.Updater.service.in',
'xyz.openbmc_project.Software.Download.service.in',
- 'xyz.openbmc_project.Software.Sync.service.in',
- 'xyz.openbmc_project.Software.Version.service.in'
+ 'xyz.openbmc_project.Software.Sync.service.in'
]
image_updater_sources = files(
@@ -266,6 +264,11 @@
unit_files += [
'xyz.openbmc_project.Software.Manager.service.in'
]
+else
+ unit_files += [
+ 'xyz.openbmc_project.Software.BMC.Updater.service.in',
+ 'xyz.openbmc_project.Software.Version.service.in'
+ ]
endif
executable(