From a38b7ccc3fc59b7375d1f317691e3f753e228e0f Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Tue, 10 Aug 2021 15:33:55 -0700 Subject: meta-quanta: meta-gsj: Cleanup for Yocto override syntax change Cleanup with ``` convert-overrides.py meta-quanta/meta-gsj git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gsj git grep -l _gsj -- meta-quanta/meta-gsj \ | xargs sed -i 's/_gsj/:gsj/' ``` Note: Need to revert the change to BBFILE_PATTERN and LAYERSERIES_COMPAT. After cleanup ``` $ git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-gsj/ | grep '.bb' meta-quanta/meta-gsj/recipes-bsp/u-boot/u-boot-fw-utils-nuvoton_%.bbappend:do_install:append:gsj () { meta-quanta/meta-gsj/recipes-google/ipmi/google-ipmi-sys_%.bbappend:do_install:append:gsj() { meta-quanta/meta-gsj/recipes-gsj/detect-fan-fail/detect-fan-fail.bb:do_install:append:gsj() { meta-quanta/meta-gsj/recipes-gsj/quanta-nvme-powerctrl/quanta-nvme-powerctrl.bb:do_install () { meta-quanta/meta-gsj/recipes-phosphor/fans/phosphor-pid-control_%.bbappend:do_install:append:gsj() { meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend:do_install:append:gsj() { ``` Change-Id: I058371ed32214d665aaaf616a650c2efeaf5be66 Signed-off-by: Willy Tu --- .../meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend | 2 +- .../meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend | 2 +- .../meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend | 6 +++--- .../meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend | 8 ++++---- .../meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'meta-quanta/meta-gsj/recipes-phosphor/ipmi') diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 5723801b2..45c2ab20b 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend index a51d07ef8..10b1d2901 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-flash_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_gsj = " net-bridge reboot-update static-bmc" +PACKAGECONFIG:append:gsj = " net-bridge reboot-update static-bmc" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 32989f2bb..2fb5443fb 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -1,6 +1,6 @@ inherit obmc-phosphor-systemd -FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:gsj := "${THISDIR}/${PN}:" EEPROM_NAMES = "hsbp bmc" @@ -10,11 +10,11 @@ EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}:append:gsj := " ${@compose_list(d, 'ENVFMT', 'EEPROMS')}" TMPL = "obmc-read-eeprom@.service" TGT = "multi-user.target" INSTFMT = "obmc-read-eeprom@{0}.service" FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" -SYSTEMD_LINK_${PN}_append_gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" +SYSTEMD_LINK_${PN}:append:gsj := " ${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index f695261ba..70b2b63f2 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # Replace the default whitelist for GSJ board. -SRC_URI_append_gsj = " file://gsj-ipmid-whitelist.conf" +SRC_URI:append:gsj = " file://gsj-ipmid-whitelist.conf" -WHITELIST_CONF_remove_gsj = " ${S}/host-ipmid-whitelist.conf" -WHITELIST_CONF_append_gsj = " ${WORKDIR}/gsj-ipmid-whitelist.conf" +WHITELIST_CONF:remove:gsj = " ${S}/host-ipmid-whitelist.conf" +WHITELIST_CONF:append:gsj = " ${WORKDIR}/gsj-ipmid-whitelist.conf" diff --git a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index ac2c0ba5e..aee769c32 100644 --- a/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-quanta/meta-gsj/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -1,3 +1,3 @@ # In gsj, usb0 is the interface. -RMCPP_IFACE_gsj = "usb0" +RMCPP_IFACE:gsj = "usb0" -- cgit v1.2.3