From dd6464e1cc0370f85ae0d4ee319e04a0912c9553 Mon Sep 17 00:00:00 2001 From: George Liu Date: Sat, 7 Aug 2021 10:09:52 +0800 Subject: meta-inspur: Cleanup for Yocto override syntax change Refer to: https://lore.kernel.org/openbmc/YQ1FD5q8KbhbXVBK@heinlein/ ``` poky/scripts/contrib/convert-overrides.py meta-inspur git grep "_[a-z0-9_/-]*[ :]" -- meta-inspur | grep ".bb" git grep -l _fp5280g2 -- meta-inspur | xargs sed -i \ 's/_fp5280g2/:fp5280g2/' git grep -l _on5263m5 -- meta-inspur | xargs sed -i \ 's/_on5263m5/:on5263m5/' git grep -l _virtual -- meta-inspur | xargs sed -i \ 's/_virtual/:virtual/' ``` Signed-off-by: George Liu Change-Id: I5ef5039691caf5e33fb865da0fdd70d95d7e3bdf --- .../recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb | 2 +- .../recipes-phosphor/power/phosphor-power_%.bbappend | 10 +++++----- .../power/phosphor-psu-software-manager_%.bbappend | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-inspur/meta-fp5280g2/recipes-phosphor/power') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb index 7c9e4f679..ce285f14f 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-fp5280g2-psu-update.bb @@ -16,5 +16,5 @@ do_install() { install -m 0755 ${S}/fp5280g2-psu-update ${D}${bindir}/fp5280g2-psu-update } -INSANE_SKIP_${PN} = "ldflags" +INSANE_SKIP:${PN} = "ldflags" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend index b9c22beb4..38efc160d 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-power_%.bbappend @@ -1,15 +1,15 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" inherit obmc-phosphor-systemd SRC_URI += "file://psu.json" -PACKAGECONFIG_append = " monitor" +PACKAGECONFIG:append = " monitor" PSU_MONITOR_ENV_FMT = "obmc/power-supply-monitor/power-supply-monitor-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor_append_fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}-monitor:append:fp5280g2 = " ${@compose_list(d, 'PSU_MONITOR_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" -do_install_append() { +do_install:append() { install -D ${WORKDIR}/psu.json ${D}${datadir}/phosphor-power/psu.json } -FILES_${PN} += "${datadir}/phosphor-power/psu.json" +FILES:${PN} += "${datadir}/phosphor-power/psu.json" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend index 6d4804d12..1b6c91265 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/power/phosphor-psu-software-manager_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -- cgit v1.2.3