From fa1aa4d9bba2b95f28828ad7c473b63cb66037e4 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Sat, 7 Aug 2021 05:09:50 +0000 Subject: meta-ampere: Cleanup for Yocto override syntax change Run convert-overrides.py meta-ampere and update missing changes as below: - Change all _mtjade to :mtjade - Change all _${PN} to :${PN} Tested: 1. Check compilation without problem. 2. Check basic functions like switch UART mux, power control. Signed-off-by: Thang Q. Nguyen Change-Id: I42038b2a98ed1951d6c770bdf49f5fc440f8163e --- .../meta-common/recipes-ac01/host/ampere-hostctrl.bb | 10 +++++----- .../meta-common/recipes-ac01/mac/ampere-mac-update.bb | 8 ++++---- .../packagegroups/packagegroup-ampere-apps.bb | 18 +++++++++--------- .../meta-common/recipes-ac01/usbnet/ampere-usbnet.bb | 6 +++--- .../recipes-devtools/mtd/mtd-utils_%.bbappend | 2 +- .../recipes-extended/rsyslog/rsyslog_%.bbappend | 10 +++++----- .../flash/phosphor-software-manager_%.bbappend | 6 +++--- .../recipes-phosphor/interfaces/bmcweb_%.bbappend | 4 ++-- .../network/phosphor-network_%.bbappend | 2 +- .../sel-logger/phosphor-sel-logger_%.bbappend | 2 +- .../state/phosphor-state-manager_%.bbappend | 8 ++++---- 11 files changed, 38 insertions(+), 38 deletions(-) (limited to 'meta-ampere/meta-common') diff --git a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb index 5c4b6a012..03f0d58ad 100644 --- a/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb +++ b/meta-ampere/meta-common/recipes-ac01/host/ampere-hostctrl.bb @@ -15,7 +15,7 @@ SRC_URI = " \ " SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ ampere-host-force-reset@.service \ " @@ -24,12 +24,12 @@ HOST_WARM_REBOOT_FORCE_TGT = "ampere-host-force-reset@.service" HOST_WARM_REBOOT_FORCE_INSTMPL = "ampere-host-force-reset@{0}.service" HOST_WARM_REBOOT_FORCE_TGTFMT = "obmc-host-force-warm-reboot@{0}.target" HOST_WARM_REBOOT_FORCE_TARGET_FMT = "../${HOST_WARM_REBOOT_FORCE_TGT}:${HOST_WARM_REBOOT_FORCE_TGTFMT}.requires/${HOST_WARM_REBOOT_FORCE_INSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${HOST_WARM_REBOOT_FORCE_TGT}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_WARM_REBOOT_FORCE_TARGET_FMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE:${PN} += "${HOST_WARM_REBOOT_FORCE_TGT}" HOST_ON_RESET_HOSTTMPL = "ampere-host-on-host-check@.service" HOST_ON_RESET_HOSTINSTMPL = "ampere-host-on-host-check@{0}.service" HOST_ON_RESET_HOSTTGTFMT = "obmc-host-startmin@{0}.target" HOST_ON_RESET_HOSTFMT = "../${HOST_ON_RESET_HOSTTMPL}:${HOST_ON_RESET_HOSTTGTFMT}.requires/${HOST_ON_RESET_HOSTINSTMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" -SYSTEMD_SERVICE_${PN} += "${HOST_ON_RESET_HOSTTMPL}" +SYSTEMD_LINK:${PN} += "${@compose_list_zip(d, 'HOST_ON_RESET_HOSTFMT', 'OBMC_HOST_INSTANCES')}" +SYSTEMD_SERVICE:${PN} += "${HOST_ON_RESET_HOSTTMPL}" diff --git a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb index 3e18ad71e..b6ddfad80 100644 --- a/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb +++ b/meta-ampere/meta-common/recipes-ac01/mac/ampere-mac-update.bb @@ -10,17 +10,17 @@ inherit systemd inherit obmc-phosphor-systemd DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" SRC_URI += " \ file://ampere_update_mac.sh \ " -SYSTEMD_SERVICE_${PN} = "ampere_update_mac.service" +SYSTEMD_SERVICE:${PN} = "ampere_update_mac.service" -do_install_append() { +do_install:append() { install -d ${D}/${sbindir} install -m 755 ${WORKDIR}/ampere_update_mac.sh ${D}/${sbindir} } diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb index 8da9e896e..856d3dc0a 100644 --- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -15,12 +15,12 @@ PROVIDES += "virtual/obmc-chassis-mgmt" PROVIDES += "virtual/obmc-flash-mgmt" PROVIDES += "virtual/obmc-system-mgmt" -RPROVIDES_${PN}-chassis += "virtual-obmc-chassis-mgmt" -RPROVIDES_${PN}-flash += "virtual-obmc-flash-mgmt" -RPROVIDES_${PN}-system += "virtual-obmc-system-mgmt" +RPROVIDES:${PN}-chassis += "virtual-obmc-chassis-mgmt" +RPROVIDES:${PN}-flash += "virtual-obmc-flash-mgmt" +RPROVIDES:${PN}-system += "virtual-obmc-system-mgmt" -SUMMARY_${PN}-chassis = "Ampere Chassis" -RDEPENDS_${PN}-chassis = " \ +SUMMARY:${PN}-chassis = "Ampere Chassis" +RDEPENDS:${PN}-chassis = " \ obmc-op-control-power \ ampere-hostctrl \ phosphor-hostlogger \ @@ -29,11 +29,11 @@ RDEPENDS_${PN}-chassis = " \ virtual/obmc-gpio-presence \ " -SUMMARY_${PN}-system = "Ampere System" -RDEPENDS_${PN}-system = " \ +SUMMARY:${PN}-system = "Ampere System" +RDEPENDS:${PN}-system = " \ " -SUMMARY_${PN}-flash = "Ampere Flash" -RDEPENDS_${PN}-flash = " \ +SUMMARY:${PN}-flash = "Ampere Flash" +RDEPENDS:${PN}-flash = " \ ampere-flash-utils \ " diff --git a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb index f683f8015..3045fa557 100644 --- a/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb +++ b/meta-ampere/meta-common/recipes-ac01/usbnet/ampere-usbnet.bb @@ -11,17 +11,17 @@ inherit systemd inherit obmc-phosphor-systemd DEPENDS = "systemd" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ ampere_add_usbnet_gadget.service \ " SRC_URI += "file://00-bmc-usb0.network" SRC_URI += "file://ampere_add_usbnet_gadget.sh" -do_install_append() { +do_install:append() { install -d ${D}${sbindir} install -d ${D}/etc/systemd/network install -m 744 ${WORKDIR}/ampere_add_usbnet_gadget.sh ${D}${sbindir}/ diff --git a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend index 08aa3ce69..6f3e20319 100644 --- a/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend +++ b/meta-ampere/meta-common/recipes-devtools/mtd/mtd-utils_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-flashcp-support-offset-option.patch " diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend index f667fb649..034ae3cfa 100644 --- a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://rsyslog.conf \ file://rsyslog.logrotate \ @@ -7,11 +7,11 @@ SRC_URI += "file://rsyslog.conf \ file://rsyslog-override.conf \ " -FILES_${PN} += "${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" +FILES:${PN} += "${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" -PACKAGECONFIG_append = " imjournal" +PACKAGECONFIG:append = " imjournal" -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/rotate-event-logs.service ${D}${systemd_system_unitdir} install -d ${D}${systemd_system_unitdir}/rsyslog.service.d install -m 0644 ${WORKDIR}/rsyslog-override.conf \ @@ -21,4 +21,4 @@ do_install_append() { rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf } -SYSTEMD_SERVICE_${PN} += " rotate-event-logs.service" +SYSTEMD_SERVICE:${PN} += " rotate-event-logs.service" diff --git a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 5d75c711f..f5a250d60 100644 --- a/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PACKAGECONFIG[flash_bios] = "-Dhost-bios-upgrade=enabled, -Dhost-bios-upgrade=disabled" -PACKAGECONFIG_append_ = " flash_bios" +PACKAGECONFIG:append_ = " flash_bios" -SYSTEMD_SERVICE_${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}" +SYSTEMD_SERVICE:${PN}-updater += "${@bb.utils.contains('PACKAGECONFIG', 'flash_bios', 'obmc-flash-host-bios@.service', '', d)}" diff --git a/meta-ampere/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index 15fb5e670..584ce60c4 100644 --- a/meta-ampere/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append = " \ +EXTRA_OEMESON:append = " \ -Dinsecure-tftp-update=enabled \ -Dbmcweb-logging=enabled \ -Dredfish-bmc-journal=enabled \ diff --git a/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend index b2883fcaf..ef2e2bab4 100644 --- a/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " nic-ethtool" +PACKAGECONFIG:append = " nic-ethtool" diff --git a/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend index 2f74fd2c3..ba300eab2 100644 --- a/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/sel-logger/phosphor-sel-logger_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " log-threshold" +PACKAGECONFIG:append = " log-threshold" diff --git a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend index bdb89ce63..0958da520 100644 --- a/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend +++ b/meta-ampere/meta-common/recipes-phosphor/state/phosphor-state-manager_%.bbappend @@ -1,13 +1,13 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" DEPS_CFG = "resetreason.conf" DEPS_TGT = "phosphor-discover-system-state@.service" -SYSTEMD_OVERRIDE_${PN}-discover_append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" +SYSTEMD_OVERRIDE:${PN}-discover:append = "${DEPS_CFG}:${DEPS_TGT}.d/${DEPS_CFG}" SRC_URI += " \ file://ampere-reset-host-check@.service \ " -do_install_append() { +do_install:append() { install -m 0644 ${WORKDIR}/ampere-reset-host-check@.service ${D}${systemd_unitdir}/system/phosphor-reset-host-check@.service -} \ No newline at end of file +} -- cgit v1.2.3