diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-08-06 17:16:53 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-08-11 00:56:33 +0300 |
| commit | 12fc939cde971ea2094201e48fe095c41138f4aa (patch) | |
| tree | 2fc49b7224d97fc0e43011cc3d9c85eaa933d0a9 /meta-phosphor/recipes-phosphor/chassis | |
| parent | 9b3d987c3c2facf75e1039766d31fbf31508fc19 (diff) | |
| download | openbmc-12fc939cde971ea2094201e48fe095c41138f4aa.tar.xz | |
meta-phosphor: prep for new override syntax
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I588025b614416c43aa2d053765ab53bacf890cb5
Diffstat (limited to 'meta-phosphor/recipes-phosphor/chassis')
4 files changed, 10 insertions, 10 deletions
diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb index affbccfe9..3c62552c6 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-control-chassis_git.bb @@ -6,7 +6,7 @@ PV = "1.0+git${SRCPV}" inherit skeleton-python inherit obmc-phosphor-dbus-service -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ python-dbus \ python-pygobject \ python-netclient \ @@ -16,4 +16,4 @@ RDEPENDS_${PN} += "\ SKELETON_DIR = "pychassisctl" FMT = "org.openbmc.control.Chassis@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +DBUS_SERVICE:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb index 490a61534..84403d57b 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-host-failure-reboots.bb @@ -11,5 +11,5 @@ TMPL = "host-failure-reboots@.service" INSTFMT = "host-failure-reboots@{0}.service" LINK_FMT = "${TMPL}:${INSTFMT}" -SYSTEMD_SERVICE_${PN} += "${TMPL}" +SYSTEMD_SERVICE:${PN} += "${TMPL}" SYSTEMD_LINK_${PN} += "${@compose_list(d, 'LINK_FMT', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb index 8bae112ae..8c0394f2a 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb @@ -12,9 +12,9 @@ DEPENDS += "phosphor-mapper systemd" SKELETON_DIR = "op-pwrctl" FMT = "org.openbmc.control.Power@{0}.service" -DBUS_SERVICE_${PN} += "${@compose_list(d, 'FMT', 'OBMC_POWER_INSTANCES')}" +DBUS_SERVICE:${PN} += "${@compose_list(d, 'FMT', 'OBMC_POWER_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += " \ +SYSTEMD_SERVICE:${PN} += " \ op-power-start@.service \ op-wait-power-on@.service \ op-power-stop@.service \ diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb index 933d43119..f50b3d59b 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-phosphor-buttons_git.bb @@ -13,7 +13,7 @@ inherit cmake pkgconfig systemd BUTTON_PACKAGES="${PN}-signals ${PN}-handler" -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGE_BEFORE_PN += "${BUTTON_PACKAGES}" PACKAGECONFIG ??= "signals handler" SYSTEMD_PACKAGES = "${BUTTON_PACKAGES}" @@ -21,11 +21,11 @@ SYSTEMD_PACKAGES = "${BUTTON_PACKAGES}" PACKAGECONFIG[signals] = ",,gpioplus nlohmann-json," PACKAGECONFIG[handler] = ",,,phosphor-state-manager-chassis phosphor-state-manager-host" -FILES_${PN}-signals = "${bindir}/buttons" -SYSTEMD_SERVICE_${PN}-signals = "xyz.openbmc_project.Chassis.Buttons.service" +FILES:${PN}-signals = "${bindir}/buttons" +SYSTEMD_SERVICE:${PN}-signals = "xyz.openbmc_project.Chassis.Buttons.service" -FILES_${PN}-handler = "${bindir}/button-handler" -SYSTEMD_SERVICE_${PN}-handler = "phosphor-button-handler.service" +FILES:${PN}-handler = "${bindir}/button-handler" +SYSTEMD_SERVICE:${PN}-handler = "phosphor-button-handler.service" DEPENDS += " \ systemd \ |