From e83c22094b7e4970c96bcee273ab08d05bbc0a30 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 1 Sep 2021 16:17:33 -0500 Subject: meta-phosphor: change systemd.bbclass to match upstream override syntax Upstream bbclasses changed to typically use the `:${PN}` override syntax, including the SYSTEMD_ variables. Change our systemd.bbclass to do the same for consistency and perform a tree-wide variable replacement. Spot checked by building bletchley and witherspoon and checking some of the SYSTEMD_LINK directives on installed packages under qemu. Signed-off-by: Patrick Williams Change-Id: I20a9dd809bff8af8759488734f80486c7228c6eb --- .../sensors/phosphor-hwmon_%.bbappend | 2 +- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/vrm-control.bb | 2 +- .../recipes-phosphor/gpio/id-button.bb | 4 +-- .../sensors/phosphor-hwmon_%.bbappend | 4 +-- .../recipes-phosphor/chassis/avsbus-control.bb | 4 +-- .../recipes-phosphor/chassis/power-workarounds.bb | 2 +- meta-ibm/recipes-phosphor/chassis/vrm-control.bb | 6 ++-- .../dbus/phosphor-dbus-monitor_%.bbappend | 4 +-- meta-ibm/recipes-phosphor/fans/fan-watchdog.bb | 6 ++-- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 38 +++++++++++----------- meta-ibm/recipes-phosphor/gpio/id-button.bb | 4 +-- .../gpio/phosphor-gpio-monitor_%.bbappend | 8 ++--- .../leds/phosphor-led-manager_%.bbappend | 2 +- .../recipes-phosphor/logging/ibm-logging_git.bb | 2 +- .../power/phosphor-power_%.bbappend | 2 +- .../power/witherspoon-power-supply-sync.bb | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 14 ++++---- .../watchdog/phosphor-watchdog_%.bbappend | 2 +- 19 files changed, 56 insertions(+), 56 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 13b8535a5..573c0b869 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -10,4 +10,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb index 52fc793ac..36b77a03d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/avsbus-control.bb @@ -28,6 +28,6 @@ FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN} += "${TMPL_DIS}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb index 7981baa0c..f25f35442 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/chassis/vrm-control.bb @@ -24,4 +24,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb index 3cbf82408..a7bebeb1c 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/meta-romulus/recipes-phosphor/gpio/id-button.bb @@ -17,7 +17,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -27,4 +27,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index e3d012247..703cac279 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -21,5 +21,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb index c46926f90..1ae5699b7 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb @@ -31,6 +31,6 @@ FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_EN', 'OBMC_CHASSIS_INSTANCES')}" SYSTEMD_SERVICE:${PN}:append:witherspoon = " ${TMPL_DIS}" -SYSTEMD_LINK_${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb index 2d00264dc..6ab0ae2d2 100644 --- a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb @@ -23,4 +23,4 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" SYSTEMD_SERVICE:${PN} += "${TMPL_WA}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_WA', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb index 8a9ef7fae..cc297d27b 100644 --- a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb @@ -37,6 +37,6 @@ FMT_ON_IRUNBIND = "../${TMPL_ON_IRUNBIND}:${TGTFMT_ON}.requires/${INSTFMT_ON_IRU SYSTEMD_SERVICE:${PN} += "${TMPL_ON_IRUNBIND} ${TMPL_ON_IRBIND}" SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " ${TMPL}" -SYSTEMD_LINK_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'FMT_ON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON_IRBIND', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT_ON_IRUNBIND', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend index 3071cb4c9..6731a7abb 100644 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/dbus/phosphor-dbus-monitor_%.bbappend @@ -1,2 +1,2 @@ -SYSTEMD_LINK_phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" -SYSTEMD_LINK_phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK:phosphor-msl-verify:append:ibm-ac-server = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" +SYSTEMD_LINK:phosphor-msl-verify:append:mihawk = " ../phosphor-msl-verify.service:obmc-chassis-poweron@0.target.requires/phosphor-msl-verify.service" diff --git a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb index ad44ba346..4673c44c0 100644 --- a/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb +++ b/meta-ibm/recipes-phosphor/fans/fan-watchdog.bb @@ -18,6 +18,6 @@ WATCHDOG_SERVICE = "fan-watchdog.service" WATCHDOG_FMT = "../${WATCHDOG_SERVICE}:${TGTFMT}.requires/${WATCHDOG_SERVICE}" SYSTEMD_SERVICE:${PN} += "${RESET_SERVICE} ${MONITOR_SERVICE} ${WATCHDOG_SERVICE}" -SYSTEMD_LINK_${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "obmc/fan-watchdog/fan-watchdog.conf" +SYSTEMD_LINK:${PN} += "${RESET_FMT} ${WATCHDOG_FMT}" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/reset-fan-watchdog.conf" +SYSTEMD_ENVIRONMENT_FILE:${PN} += "obmc/fan-watchdog/fan-watchdog.conf" diff --git a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend index 8b4e91e93..469f76539 100644 --- a/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -19,42 +19,42 @@ FMT_COOLING = "../${TMPL_COOLING}:${MULTI_USR_TGT}.requires/${INSTFMT_COOLING}" FILES:phosphor-cooling-type:append:ibm-ac-server = " ${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type:append:ibm-ac-server = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" FILES:phosphor-cooling-type:append:mihawk = " ${bindir}/phosphor-cooling-type" SYSTEMD_SERVICE:phosphor-cooling-type:append:mihawk = " ${TMPL_COOLING}" -SYSTEMD_LINK_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'FMT_COOLING', 'OBMC_CHASSIS_INSTANCES')}" COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:ibm-ac-server = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:phosphor-cooling-type:append:mihawk = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" #These services are protected by the watchdog -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-control@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor-init@0.service.d/fan-watchdog-monitor.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-monitor.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-monitor.conf" #These services need to be stopped when watchdog expires -SYSTEMD_OVERRIDE_phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" -SYSTEMD_OVERRIDE_phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:witherspoon += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-control:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-control@0.service.d/fan-watchdog-conflicts.conf" +SYSTEMD_OVERRIDE:phosphor-fan-monitor:p10bmc += "fan-watchdog-conflicts.conf:phosphor-fan-monitor@0.service.d/fan-watchdog-conflicts.conf" # Witherspoon fan control service linking # Link fan control init service SYSTEMD_SERVICE:${PN}-control:witherspoon += "${TMPL_CONTROL} ${TMPL_CONTROL_INIT}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_INIT', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to be started at standby FMT_CONTROL_STDBY:witherspoon = "../${TMPL_CONTROL}:${MULTI_USR_TGT}.wants/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_STDBY', 'OBMC_CHASSIS_INSTANCES')}" # Link fan control service to also start at poweron FMT_CONTROL_PWRON:witherspoon = "../${TMPL_CONTROL}:${POWERON_TGT}.requires/${INSTFMT_CONTROL}" -SYSTEMD_LINK_${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_LINK:${PN}-control:witherspoon += "${@compose_list(d, 'FMT_CONTROL_PWRON', 'OBMC_CHASSIS_INSTANCES')}" # Enable the use of JSON on the fan applications that support it PACKAGECONFIG:append:witherspoon = " json" diff --git a/meta-ibm/recipes-phosphor/gpio/id-button.bb b/meta-ibm/recipes-phosphor/gpio/id-button.bb index 01df2ea5b..3e53f9d08 100644 --- a/meta-ibm/recipes-phosphor/gpio/id-button.bb +++ b/meta-ibm/recipes-phosphor/gpio/id-button.bb @@ -17,7 +17,7 @@ do_install() { ${D}${bindir}/toggle_identify_led.sh } -SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/id_button" +SYSTEMD_ENVIRONMENT_FILE:${PN} +="obmc/gpio/id_button" ID_BUTTON_SERVICE = "id_button" @@ -27,4 +27,4 @@ TGT = "multi-user.target" FMT = "../${TMPL}:${TGT}.requires/${INSTFMT}" SYSTEMD_SERVICE:${PN} += "id-button-pressed.service" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" +SYSTEMD_LINK:${PN} += "${@compose_list(d, 'FMT', 'ID_BUTTON_SERVICE')}" diff --git a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend index 272a8a1f5..6bb236463 100644 --- a/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ b/meta-ibm/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -5,10 +5,10 @@ INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" POWERSUPPLY_TGT = "multi-user.target" FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.wants/${INSTFMT_POWERSUPPLY}" -SYSTEMD_LINK_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_LINK_${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_LINK:${PN}-presence:append:mihawk = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:ibm-ac-server = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-presence:append:mihawk = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend index 57fb62b35..f734bf530 100644 --- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend +++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend @@ -3,7 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SYSTEMD_SERVICE:${PN}:append:p10bmc += "obmc-led-set-all-groups-asserted@.service obmc-led-create-virtual-leds@.service" # Copies config file having arguments for led-set-all-groups-asserted.sh -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc +="obmc/led/set-all/groups/config" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc +="obmc/led/set-all/groups/config" # Use the JSON configuration file at runtime than the static led.yaml # Also, enable Lamp Test and OperationalStatus monitor feature for diff --git a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb index 8d6e64073..6a0e18189 100644 --- a/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb +++ b/meta-ibm/recipes-phosphor/logging/ibm-logging_git.bb @@ -41,7 +41,7 @@ DBUS_SERVICE:${PN} += "${SERVICE}" #The BindsTo in the service will not do the restart, it will only do the #original start and a stop. LOG_FMT = "../${SERVICE}:xyz.openbmc_project.Logging.service.wants/${SERVICE}" -SYSTEMD_LINK_${PN} += "${LOG_FMT}" +SYSTEMD_LINK:${PN} += "${LOG_FMT}" do_install:append(){ diff --git a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend index 9acaad768..c8d6a4617 100644 --- a/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/power/phosphor-power_%.bbappend @@ -21,4 +21,4 @@ do_install:append(){ FILES:${PN} += "${datadir}/phosphor-power/psu.json" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}-monitor:append:ibm-ac-server += "${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb index 4c4c88401..74bb9a0c5 100644 --- a/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb +++ b/meta-ibm/recipes-phosphor/power/witherspoon-power-supply-sync.bb @@ -13,4 +13,4 @@ TGTFMT = "obmc-chassis-poweron@0.target" SYNC_FMT = "../${SYNC_SERVICE}:${TGTFMT}.wants/${SYNC_SERVICE}" SYSTEMD_SERVICE:${PN} += "${SYNC_SERVICE}" -SYSTEMD_LINK_${PN} += "${SYNC_FMT}" +SYSTEMD_LINK:${PN} += "${SYNC_FMT}" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 080025ead..7932eb3a0 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -106,16 +106,16 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:ibm-ac-server = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mihawk = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc = " ${@compose_list(d, 'ENVS', 'ITEMS')}" # Enable and install the max31785-msl package PACKAGECONFIG:append:ibm-ac-server = " max31785-msl" -SYSTEMD_ENVIRONMENT_FILE_max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" -SYSTEMD_LINK_max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" +SYSTEMD_ENVIRONMENT_FILE:max31785-msl:append:ibm-ac-server = " obmc/hwmon-max31785/max31785.conf" +SYSTEMD_LINK:max31785-msl:append:ibm-ac-server = " ../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service" diff --git a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend index 7d904461f..e2f146854 100644 --- a/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend +++ b/meta-ibm/recipes-phosphor/watchdog/phosphor-watchdog_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # utilize a 600s default timer config for p10bmc -SYSTEMD_ENVIRONMENT_FILE_${PN}:append:p10bmc = " obmc/watchdog/poweron" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:p10bmc = " obmc/watchdog/poweron" -- cgit v1.2.3