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 --- .../fans/phosphor-fan-control-events-config.bbappend | 2 +- .../fans/phosphor-fan-control-fan-config.bbappend | 2 +- .../fans/phosphor-fan-control-zone-conditions-config.bbappend | 2 +- .../fans/phosphor-fan-control-zone-config.bbappend | 2 +- .../recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend | 2 +- .../fans/phosphor-fan-presence-config.bbappend | 2 +- .../recipes-phosphor/fans/phosphor-fan_%.bbappend | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'meta-inspur/meta-fp5280g2/recipes-phosphor/fans') diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-events-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-fan-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend index 956e7bf25..a29da8b68 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-control-zone-config.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-monitor-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend index a5847a64f..f48eef4f2 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan-presence-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_fp5280g2 := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend:fp5280g2 := "${THISDIR}/${BPN}:" diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend index 2e3dcadbb..319cd1658 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,21 +1,21 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" # Package configuration FAN_PACKAGES += " \ phosphor-cooling-type \ " -PACKAGECONFIG_append_fp5280g2 = " cooling-type" +PACKAGECONFIG:append:fp5280g2 = " cooling-type" TMPL_COOLING = "phosphor-cooling-type@.service" INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" COOLING_TGT = "multi-user.target" FMT_COOLING = "../${TMPL_COOLING}:${COOLING_TGT}.requires/${INSTFMT_COOLING}" -FILES_phosphor-cooling-type = "${bindir}/phosphor-cooling-type" -SYSTEMD_SERVICE_phosphor-cooling-type += "${TMPL_COOLING}" +FILES:phosphor-cooling-type = "${bindir}/phosphor-cooling-type" +SYSTEMD_SERVICE:phosphor-cooling-type += "${TMPL_COOLING}" SYSTEMD_LINK_phosphor-cooling-type += "${@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_fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type:append:fp5280g2 = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" -- cgit v1.2.3