From 026925dd6641c96768d9636b6114acbfcdb8579f Mon Sep 17 00:00:00 2001 From: David Wang Date: Fri, 13 Aug 2021 11:39:20 +0800 Subject: meta-quanta: Cleanup for Yocto override syntax change - Cleanup subtree meta-f0b, meta-olympus-nuvoton, meta-q71l with convert-overrides.py meta-quanta/meta-f0b convert-overrides.py meta-quanta/meta-olympus-nuvoton convert-overrides.py meta-quanta/meta-q71l git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-f0b git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-olympus-nuvoton git grep "_[a-z0-9_/-]*[ :]" -- meta-quanta/meta-q71l git grep -l _f0b -- meta-quanta/meta-f0b | xargs sed -i 's/_f0b/:f0b/' git grep -l _olympus-nuvoton -- meta-quanta/meta-olympus-nuvoton | xargs sed -i 's/_olympus-nuvoton/:olympus-nuvoton/' git grep -l _quanta-q71l -- meta-quanta/meta-q71l | xargs sed -i 's/_quanta-q71l/:quanta-q71l/' - Fix up a few by hand - Revert 'BBFILE_PATTERN' and 'LAYERSERIES_COMPAT' - Add honister to 'LAYERSERIES_COMPAT' - Update 'CONF_VERSION' - Fix up 'SYSTEMD_ENVIRONMENT_FILE', 'SYSTEMD_LINK' and 'SYSTEMD_OVERRIDE' in all subtree Signed-off-by: David Wang Change-Id: Ic431624d09dc5899b1d84439559bea9efca08ad8 --- .../hotswap-power-cycle/adm1278-hotswap-power-cycle.bb | 4 ++-- .../network/mac-address_%.bbappend | 8 ++++---- .../network/olympus-nuvoton-iptable-save.bb | 2 +- .../packagegroups/packagegroup-olympus-nuvoton-apps.bb | 16 ++++++++-------- .../recipes-olympus-nuvoton/power/first-boot-set-psu.bb | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton') diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/hotswap-power-cycle/adm1278-hotswap-power-cycle.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/hotswap-power-cycle/adm1278-hotswap-power-cycle.bb index 1a20beec7..6f5acd4c7 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/hotswap-power-cycle/adm1278-hotswap-power-cycle.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/hotswap-power-cycle/adm1278-hotswap-power-cycle.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit systemd DEPENDS += "systemd" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" SRC_URI = " file://hotswap-power-cycle.service" @@ -17,5 +17,5 @@ do_install() { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "hotswap-power-cycle.service" +SYSTEMD_SERVICE:${PN} = "hotswap-power-cycle.service" diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/mac-address_%.bbappend b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/mac-address_%.bbappend index a9f0c407a..55531d54d 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/mac-address_%.bbappend +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/mac-address_%.bbappend @@ -1,10 +1,10 @@ -FILESEXTRAPATHS_prepend_olympus-nuvoton := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:olympus-nuvoton := "${THISDIR}/files:" -SRC_URI_append_olympus-nuvoton = " file://config.txt" +SRC_URI:append:olympus-nuvoton = " file://config.txt" -FILES_${PN}_append_olympus-nuvoton = " ${datadir}/mac-address/config.txt" +FILES:${PN}:append:olympus-nuvoton = " ${datadir}/mac-address/config.txt" -do_install_append_olympus-nuvoton() { +do_install:append:olympus-nuvoton() { install -d ${D}${datadir}/mac-address install -m 0644 -D ${WORKDIR}/config.txt \ ${D}${datadir}/mac-address/config.txt diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/olympus-nuvoton-iptable-save.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/olympus-nuvoton-iptable-save.bb index 2416ef932..b8d7b78f1 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/olympus-nuvoton-iptable-save.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/network/olympus-nuvoton-iptable-save.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch systemd SRC_URI = "file://phosphor-save-iptable-rules.service" -SYSTEMD_SERVICE_${PN} = "phosphor-save-iptable-rules.service" +SYSTEMD_SERVICE:${PN} = "phosphor-save-iptable-rules.service" S = "${WORKDIR}" do_install() { diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb index 6d9c86a76..d462d6905 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/packagegroups/packagegroup-olympus-nuvoton-apps.bb @@ -16,18 +16,18 @@ PROVIDES += "virtual/obmc-fan-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-fans += "virtual-obmc-fan-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-fans += "virtual-obmc-fan-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-fans = "OLYMPUS NUVOTON Fans" -RDEPENDS_${PN}-fans = " \ +SUMMARY:${PN}-fans = "OLYMPUS NUVOTON Fans" +RDEPENDS:${PN}-fans = " \ phosphor-pid-control \ " -SUMMARY_${PN}-system = "OLYMPUS NUVOTON System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "OLYMPUS NUVOTON System" +RDEPENDS:${PN}-system = " \ phosphor-webui \ obmc-ikvm \ obmc-console \ diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/power/first-boot-set-psu.bb b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/power/first-boot-set-psu.bb index ed9c13687..de540db74 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/power/first-boot-set-psu.bb +++ b/meta-quanta/meta-olympus-nuvoton/recipes-olympus-nuvoton/power/first-boot-set-psu.bb @@ -6,11 +6,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch systemd -RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_base-utils}" +RDEPENDS:${PN} += "bash" -SYSTEMD_SERVICE_${PN} = "first-boot-set-psu@.service" -SYSTEMD_SERVICE_${PN} += "first-boot-set-psu@0-2-0x58.service" +SYSTEMD_SERVICE:${PN} = "first-boot-set-psu@.service" +SYSTEMD_SERVICE:${PN} += "first-boot-set-psu@0-2-0x58.service" SRC_URI = "file://${BPN}.sh file://${BPN}@.service" -- cgit v1.2.3