meta-bytedance: Cleanup for Yocto override syntax change
convert-overrides.py meta-bytedance
git grep -l _g220a -- meta-bytedance | grep ".bb" | \
xargs sed -i 's/_g220a/:g220a/'
git grep -l _u-boot -- meta-bytedance | xargs sed -i \
's/_u-boot/:u-boot/'
Tested:
$ git grep "_[a-z0-9_/-]*[ :]" -- meta-bytedance | grep ".bb"
meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend:do_install:append() {
meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend:do_install:append() {
meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend:do_install:append() {
meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend:do_install:append(){
meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend:do_install:append() {
meta-bytedance/recipes-core/systemd/systemd-conf_%.bbappend:do_install:append() {
meta-bytedance/recipes-core/systemd/systemd_%.bbappend:do_install:append () {
Signed-off-by: Lei YU <yulei.sh@bytedance.com>
Change-Id: I26fb4c52012ee407ceb26c5a4120bf7b0b7a165a
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend
index 6ec2a72..504f151 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/chassis/x86-power-control_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
SRC_URI += " file://power-config-host0.json"
-do_install_append() {
+do_install:append() {
install -d {D}/usr/share/x86-power-control/
install -m 0644 ${WORKDIR}/power-config-host0.json ${D}/usr/share/x86-power-control/
}
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend
index 64ce5cf..e675c70 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
-SRC_URI_append = " file://g220a_baseboard.json \
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
+SRC_URI:append = " file://g220a_baseboard.json \
"
-do_install_append() {
+do_install:append() {
install -d ${D}/usr/share/entity-manager/configurations
install -m 0444 ${WORKDIR}/*.json ${D}/usr/share/entity-manager/configurations
}
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config.bb b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config.bb
index 62fe8fe..f91dc62 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config.bb
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/configuration/g220a-yaml-config.bb
@@ -25,11 +25,11 @@
${D}${datadir}/${BPN}/ipmi-sensors.yaml
}
-FILES_${PN}-dev = " \
+FILES:${PN}-dev = " \
${datadir}/${BPN}/ipmi-extra-properties.yaml \
${datadir}/${BPN}/ipmi-fru-read.yaml \
${datadir}/${BPN}/ipmi-inventory-sensors.yaml \
${datadir}/${BPN}/ipmi-sensors.yaml \
"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend
index a5d722f..192b250 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console_%.bbappend
@@ -1,14 +1,14 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}"
+FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
OBMC_CONSOLE_HOST_TTY = "ttyS2"
SRC_URI += "file://obmc-console@.service \
"
inherit obmc-phosphor-systemd
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
${PN}@${OBMC_CONSOLE_HOST_TTY}.service \
"
-do_install_append() {
+do_install:append() {
rm -rf ${D}${base_libdir}/udev/rules.d/80-obmc-console-uart.rules
install -m 0644 ${WORKDIR}/${PN}@.service ${D}${systemd_system_unitdir}
}
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync.bb b/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync.bb
index 776bccf..2cb5dfa 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync.bb
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/datetime/me-time-sync.bb
@@ -6,7 +6,7 @@
inherit allarch
inherit obmc-phosphor-systemd
-RDEPENDS_${PN} += "bash"
+RDEPENDS:${PN} += "bash"
S = "${WORKDIR}"
@@ -17,4 +17,4 @@
install -m 0755 ${S}/me-time-sync.sh ${D}${bindir}/me-time-sync.sh
}
-SYSTEMD_SERVICE_${PN} += "me-time-sync.service"
+SYSTEMD_SERVICE:${PN} += "me-time-sync.service"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 6664699..6e528dc 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
inherit obmc-phosphor-systemd
-SYSTEMD_SERVICE_${PN} = "phosphor-pid-control.service"
+SYSTEMD_SERVICE:${PN} = "phosphor-pid-control.service"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend
index 3059e80..6369a83 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/images/obmc-phosphor-image.bbappend
@@ -1,4 +1,4 @@
-OBMC_IMAGE_EXTRA_INSTALL_append_g220a = " \
+OBMC_IMAGE_EXTRA_INSTALL:append:g220a = " \
webui-vue \
me-time-sync \
static-mac-addr \
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
index 72d991c..4fc41d0 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
index 3658c6f..877a6ef 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,6 +1,6 @@
-DEPENDS_append_g220a= " g220a-yaml-config"
+DEPENDS:append:g220a= " g220a-yaml-config"
-EXTRA_OECONF_g220a= " \
+EXTRA_OECONF:g220a= " \
YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-fru-read.yaml \
PROP_YAML=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-extra-properties.yaml \
"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 4b5cc5e..41a26d7 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-DEPENDS_append_g220a= " g220a-yaml-config"
+DEPENDS:append:g220a= " g220a-yaml-config"
-EXTRA_OECONF_g220a= " \
+EXTRA_OECONF:g220a= " \
SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-sensors.yaml \
INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-inventory-sensors.yaml \
FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/g220a-yaml-config/ipmi-fru-read.yaml \
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
index 03c685d..c088629 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " file://ipmb-channels.json"
+SRC_URI:append = " file://ipmb-channels.json"
-do_install_append(){
+do_install:append(){
install -m 0644 -D ${WORKDIR}/ipmb-channels.json \
${D}/usr/share/ipmbbridge/
}
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
index 8547d9b..e5101ff 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend
@@ -1,12 +1,12 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
KCS_DEVICE = "ipmi_kcs3"
SMM_DEVICE = "ipmi_kcs4"
-SYSTEMD_SERVICE_${PN}_append = " ${PN}@${SMM_DEVICE}.service "
+SYSTEMD_SERVICE:${PN}:append = " ${PN}@${SMM_DEVICE}.service "
SRC_URI += "file://99-ipmi-kcs.rules"
-do_install_append() {
+do_install:append() {
install -d ${D}${base_libdir}/udev/rules.d
install -m 0644 ${WORKDIR}/99-ipmi-kcs.rules ${D}${base_libdir}/udev/rules.d/
}
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
index ff6edc9..e0f7094 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend
@@ -1,5 +1,5 @@
RMCPP_EXTRA = "eth1"
-SYSTEMD_SERVICE_${PN} += " \
+SYSTEMD_SERVICE:${PN} += " \
${PN}@${RMCPP_EXTRA}.service \
${PN}@${RMCPP_EXTRA}.socket \
"
diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
index 1fa0484..4d9dd1b 100644
--- a/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
+++ b/meta-bytedance/meta-g220a/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
@@ -9,7 +9,7 @@
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-SYSTEMD_SERVICE_${PN} = "node-manager-proxy.service"
+SYSTEMD_SERVICE:${PN} = "node-manager-proxy.service"
DEPENDS = "sdbusplus \
phosphor-logging \
@@ -18,6 +18,6 @@
S = "${WORKDIR}/git/"
inherit cmake systemd
-SRC_URI_append = " \
+SRC_URI:append = " \
file://0001-Remove-Total_Power-sensor.patch \
"