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 --- meta-ibm/recipes-phosphor/chassis/avsbus-control.bb | 12 ++++++------ .../chassis/obmc-op-control-power_%.bbappend | 2 +- meta-ibm/recipes-phosphor/chassis/power-workarounds.bb | 4 ++-- meta-ibm/recipes-phosphor/chassis/vrm-control.bb | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'meta-ibm/recipes-phosphor/chassis') diff --git a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb index 2e98aaf90e..c46926f90e 100644 --- a/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/avsbus-control.bb @@ -6,19 +6,19 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools" +RDEPENDS:${PN} += "i2c-tools" S = "${WORKDIR}" SRC_URI += "file://avsbus-enable.sh" -SRC_URI_append_witherspoon = " file://avsbus-disable.sh" +SRC_URI:append:witherspoon = " file://avsbus-disable.sh" do_install() { install -d ${D}${bindir} install -m 0755 ${S}/avsbus-enable.sh ${D}${bindir}/avsbus-enable.sh } -do_install_append_witherspoon() { +do_install:append:witherspoon() { install -m 0755 ${S}/avsbus-disable.sh ${D}${bindir}/avsbus-disable.sh } @@ -30,7 +30,7 @@ TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_EN = "../${TMPL_EN}:${TGTFMT}.requires/${INSTFMT_EN}" FMT_DIS = "../${TMPL_DIS}:${TGTFMT}.requires/${INSTFMT_DIS}" -SYSTEMD_SERVICE_${PN} += "${TMPL_EN}" +SYSTEMD_SERVICE:${PN} += "${TMPL_EN}" 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_SERVICE:${PN}:append:witherspoon = " ${TMPL_DIS}" +SYSTEMD_LINK_${PN}:append:witherspoon = " ${@compose_list(d, 'FMT_DIS', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend index 72d991c7e5..4fc41d0580 100644 --- a/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend +++ b/meta-ibm/recipes-phosphor/chassis/obmc-op-control-power_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" diff --git a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb index af8babb533..2d00264dce 100644 --- a/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb +++ b/meta-ibm/recipes-phosphor/chassis/power-workarounds.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools" +RDEPENDS:${PN} += "i2c-tools" S = "${WORKDIR}" @@ -22,5 +22,5 @@ INSTFMT_WA = "power-workarounds@{0}.service" TGTFMT = "obmc-chassis-poweron@{0}.target" FMT_WA = "../${TMPL_WA}:${TGTFMT}.requires/${INSTFMT_WA}" -SYSTEMD_SERVICE_${PN} += "${TMPL_WA}" +SYSTEMD_SERVICE:${PN} += "${TMPL_WA}" 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 8a0d7a6eb9..8a9ef7faec 100644 --- a/meta-ibm/recipes-phosphor/chassis/vrm-control.bb +++ b/meta-ibm/recipes-phosphor/chassis/vrm-control.bb @@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch inherit obmc-phosphor-systemd -RDEPENDS_${PN} += "i2c-tools bash" +RDEPENDS:${PN} += "i2c-tools bash" S = "${WORKDIR}" SRC_URI = "file://ir35221-unbind-bind.sh" -SRC_URI_append_ibm-ac-server = " file://vrm-control.sh" +SRC_URI:append:ibm-ac-server = " file://vrm-control.sh" do_install() { install -d ${D}${bindir} install -m 0755 ${WORKDIR}/ir35221-unbind-bind.sh ${D}${bindir}/ir35221-unbind-bind.sh } -do_install_append_ibm-ac-server() { +do_install:append:ibm-ac-server() { install -m 0755 ${WORKDIR}/vrm-control.sh ${D}${bindir}/vrm-control.sh } @@ -35,8 +35,8 @@ TMPL_ON_IRUNBIND = "ir35221-on-unbind@.service" INSTFMT_ON_IRUNBIND = "ir35221-on-unbind@{0}.service" FMT_ON_IRUNBIND = "../${TMPL_ON_IRUNBIND}:${TGTFMT_ON}.requires/${INSTFMT_ON_IRUNBIND}" -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_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')}" -- cgit v1.2.3