From fa1aa4d9bba2b95f28828ad7c473b63cb66037e4 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Sat, 7 Aug 2021 05:09:50 +0000 Subject: meta-ampere: Cleanup for Yocto override syntax change Run convert-overrides.py meta-ampere and update missing changes as below: - Change all _mtjade to :mtjade - Change all _${PN} to :${PN} Tested: 1. Check compilation without problem. 2. Check basic functions like switch UART mux, power control. Signed-off-by: Thang Q. Nguyen Change-Id: I42038b2a98ed1951d6c770bdf49f5fc440f8163e --- .../recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 10 +++++----- .../sensors/phosphor-virtual-sensor_%.bbappend | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-ampere/meta-jade/recipes-phosphor/sensors') diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 821c9b100..11cdbe666 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,8 +1,8 @@ -FILESEXTRAPATHS_append_mtjade := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_mtjade = " -Dnegative-errno-on-fail=true" +EXTRA_OEMESON:append:mtjade = " -Dnegative-errno-on-fail=true" -CHIPS_mtjade = " \ +CHIPS:mtjade = " \ bus@1e78a000/i2c-bus@100/tmp175@28 \ bus@1e78a000/i2c-bus@100/tmp175@29 \ bus@1e78a000/i2c-bus@100/tmp175@2a \ @@ -21,9 +21,9 @@ ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS_${MACHINE}')}" ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf" ENVS = "obmc/${MACHINE}/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" -do_install_append_mtjade() { +do_install:append:mtjade() { SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon" DESTDIR="${D}${sysconfdir}/default/obmc" install -d ${DESTDIR} diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 3c68ff533..3a1af4f3b 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_mtjade += " \ +SRC_URI:append:mtjade += " \ file://virtual_sensor_config.json \ " -do_install_append_mtjade() { +do_install:append:mtjade() { install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ } -- cgit v1.2.3