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 --- .../recipes-phosphor/console/obmc-console_%.bbappend | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta-ampere/meta-jade/recipes-phosphor/console') diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend index 452554c28..b52ae4933 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" -RDEPENDS_${PN} += "bash" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" +RDEPENDS:${PN} += "bash" # Remove what installed by common recipe OBMC_CONSOLE_HOST_TTY = "" -SYSTEMD_SUBSTITUTIONS_remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" -SYSTEMD_SUBSTITUTIONS_remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" -SYSTEMD_SERVICE_${PN}_remove = " \ +SYSTEMD_SUBSTITUTIONS:remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" +SYSTEMD_SUBSTITUTIONS:remove += "OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" +SYSTEMD_SERVICE:${PN}:remove = " \ ${PN}-ssh.socket \ ${PN}-ssh@.service \ " @@ -27,12 +27,12 @@ SRC_URI += "${@compose_list(d, 'CONSOLE_SSH_SERVICE_FILE_FMT', 'HOST_CONSOLE_TTY CONSOLE_SSH_SOCKET_FMT = "${PN}-{0}-ssh.socket" CONSOLE_SSH_SERVICE_FMT = "${PN}-{0}-ssh@.service" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ ${PN}@.service \ ${@compose_list(d, 'CONSOLE_SSH_SOCKET_FMT', 'HOST_CONSOLE_TTY')} \ ${@compose_list(d, 'CONSOLE_SSH_SERVICE_FMT', 'HOST_CONSOLE_TTY')} \ " -do_install_append() { +do_install:append() { for i in ${HOST_CONSOLE_TTY} do install -m 0644 ${WORKDIR}/server.${i}.conf ${D}${sysconfdir}/${BPN}/server.${i}.conf -- cgit v1.2.3