From b96c75046da8f72359d101c813f0694409bbe0d1 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Fri, 6 Aug 2021 16:25:30 +0000 Subject: meta-ibm: prep for new override syntax Change-Id: I9116ed7260e369136acb39eec15075db2d4dbeba Signed-off-by: Adriana Kobylak --- .../sensors/dbus-sensors_%.bbappend | 2 +- .../sensors/phosphor-hwmon_%.bbappend | 68 +++++++++++----------- .../sensors/phosphor-virtual-sensor_%.bbappend | 4 +- 3 files changed, 37 insertions(+), 37 deletions(-) (limited to 'meta-ibm/recipes-phosphor/sensors') diff --git a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend index 6c283f455..b5abeecb2 100644 --- a/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_p10bmc = "hwmontempsensor" +PACKAGECONFIG:p10bmc = "hwmontempsensor" diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c9e7927a3..cde45e7cc 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_mihawk = "-Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append:mihawk = "-Dnegative-errno-on-fail=true" -SRC_URI_append_ibm-ac-server = " \ +SRC_URI:append:ibm-ac-server = " \ file://70-hwmon.rules \ file://70-max31785-hwmon.rules \ file://start_max31785_hwmon.sh \ " -CHIPS_witherspoon = " \ +CHIPS:witherspoon = " \ bus@1e78a000/i2c-bus@100/max31785@52_air \ bus@1e78a000/i2c-bus@100/max31785@52_water \ bus@1e78a000/i2c-bus@100/power-supply@68 \ @@ -21,7 +21,7 @@ CHIPS_witherspoon = " \ bus@1e78a000/i2c-bus@180/ir35221@71 \ bus@1e78a000/i2c-bus@380/tmp275@4a \ " -CHIPS_swift = " \ +CHIPS:swift = " \ bus@1e78a000/i2c-bus@100/max31785@52_air \ bus@1e78a000/i2c-bus@100/max31785@52_water \ bus@1e78a000/i2c-bus@100/power-supply@68 \ @@ -38,7 +38,7 @@ CHIPS_swift = " \ bus@1e78a000/i2c-bus@3c0/ir35221@71 \ bus@1e78a000/i2c-bus@3c0/ir35221@72 \ " -CHIPS_mihawk = " \ +CHIPS:mihawk = " \ bus@1e78a000/i2c-bus@100/power-supply@58 \ bus@1e78a000/i2c-bus@100/power-supply@5b \ bus@1e78a000/i2c-bus@140/ir35221@70 \ @@ -60,7 +60,7 @@ CHIPS_mihawk = " \ bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48 \ " -CHIPS_witherspoon-tacoma = " \ +CHIPS:witherspoon-tacoma = " \ bus@1e78a000/i2c-bus@200/max31785@52_air \ bus@1e78a000/i2c-bus@200/max31785@52_water \ bus@1e78a000/i2c-bus@200/power-supply@68 \ @@ -74,29 +74,29 @@ CHIPS_witherspoon-tacoma = " \ bus@1e78a000/i2c-bus@500/tmp275@4a \ " -CHIPS_p10bmc = " \ +CHIPS:p10bmc = " \ bus@1e78a000/i2c-bus@400/max31785@52 \ bus@1e78a000/i2c-bus@780/i2c-switch@70/i2c@3/max31785@52 \ " ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" -ITEMS_append_mihawk += " iio-hwmon-vdd0.conf" -ITEMS_append_mihawk += " iio-hwmon-vdd1.conf" -ITEMS_append_mihawk += " iio-hwmon-vcs0.conf" -ITEMS_append_mihawk += " iio-hwmon-vcs1.conf" -ITEMS_append_mihawk += " iio-hwmon-vdn0.conf" -ITEMS_append_mihawk += " iio-hwmon-vdn1.conf" -ITEMS_append_mihawk += " iio-hwmon-vio0.conf" -ITEMS_append_mihawk += " iio-hwmon-vio1.conf" -ITEMS_append_mihawk += " iio-hwmon-vddra.conf" -ITEMS_append_mihawk += " iio-hwmon-vddrb.conf" -ITEMS_append_mihawk += " iio-hwmon-vddrc.conf" -ITEMS_append_mihawk += " iio-hwmon-vddrd.conf" -ITEMS_append_mihawk += " iio-hwmon-12v.conf" -ITEMS_append_mihawk += " iio-hwmon-5v.conf" -ITEMS_append_mihawk += " iio-hwmon-3v.conf" -ITEMS_append_mihawk += " iio-hwmon-battery.conf" +ITEMS:append:mihawk += " iio-hwmon-vdd0.conf" +ITEMS:append:mihawk += " iio-hwmon-vdd1.conf" +ITEMS:append:mihawk += " iio-hwmon-vcs0.conf" +ITEMS:append:mihawk += " iio-hwmon-vcs1.conf" +ITEMS:append:mihawk += " iio-hwmon-vdn0.conf" +ITEMS:append:mihawk += " iio-hwmon-vdn1.conf" +ITEMS:append:mihawk += " iio-hwmon-vio0.conf" +ITEMS:append:mihawk += " iio-hwmon-vio1.conf" +ITEMS:append:mihawk += " iio-hwmon-vddra.conf" +ITEMS:append:mihawk += " iio-hwmon-vddrb.conf" +ITEMS:append:mihawk += " iio-hwmon-vddrc.conf" +ITEMS:append:mihawk += " iio-hwmon-vddrd.conf" +ITEMS:append:mihawk += " iio-hwmon-12v.conf" +ITEMS:append:mihawk += " iio-hwmon-5v.conf" +ITEMS:append:mihawk += " iio-hwmon-3v.conf" +ITEMS:append:mihawk += " iio-hwmon-battery.conf" OCCS = " \ 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ @@ -106,20 +106,20 @@ 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" +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_SERVICE_${PN}_append_ibm-ac-server = " max31785-hwmon-helper@.service" +SYSTEMD_SERVICE:${PN}:append:ibm-ac-server = " max31785-hwmon-helper@.service" -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { install -d ${D}/${base_libdir}/udev/rules.d/ install -m 0644 ${WORKDIR}/70-max31785-hwmon.rules ${D}/${base_libdir}/udev/rules.d/ diff --git a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 878a58a01..020a27acc 100644 --- a/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-ibm/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://virtual_sensor_config.json" -do_install_append_p10bmc() { +do_install:append:p10bmc() { install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ } -- cgit v1.2.3