diff options
| author | Charles Boyer <Charles.Boyer@fii-usa.com> | 2022-01-13 02:10:17 +0300 |
|---|---|---|
| committer | Charles Boyer <Charles.Boyer@fii-usa.com> | 2022-01-18 19:39:26 +0300 |
| commit | c33f235676e9934cf8f9a6ac60ecdcc0da435374 (patch) | |
| tree | 3fb304fbc64a995463abed6e7f75b3172c03a4c3 | |
| parent | 2adad365773fb2018fb65d5dbbd2ab5b9c68d97d (diff) | |
| download | openbmc-c33f235676e9934cf8f9a6ac60ecdcc0da435374.tar.xz | |
meta-fii/meta-kudo: Clean obmc-console port configs
The obmc-console recipe changes from
https://gerrit.openbmc-project.xyz/c/openbmc/openbmc/+/49336
add support for multiple port configurations. Therefore, the configs
do not need to occur in the bbappend.
Removed the additional configuration steps to configure multiple
ports and used OBMC_CONSOLE_TTYS override instead.
Signed-off-by: Charles Boyer <Charles.Boyer@fii-usa.com>
Change-Id: Iba14a8b5935cd3cd8718a8bf94d5eed18de9db9e
| -rw-r--r-- | meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend index 990c709ba5..5dc4ab054e 100644 --- a/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend +++ b/meta-fii/meta-kudo/recipes-phosphor/console/obmc-console_%.bbappend @@ -1,38 +1,21 @@ FILESEXTRAPATHS:prepend:kudo := "${THISDIR}/${PN}:" RDEPENDS:${PN}:append:kudo = " bash" -# Remove what installed by common recipe -OBMC_CONSOLE_HOST_TTY = "" -SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh@.service" -SYSTEMD_SUBSTITUTIONS:remove:kudo = " OBMC_CONSOLE_HOST_TTY:${OBMC_CONSOLE_HOST_TTY}:${PN}-ssh.socket" +OBMC_CONSOLE_TTYS = "ttyS1 ttyS3" -# Declare port spcific conf and service files -HOST_CONSOLE_TTY = "ttyS1 ttyS3" - -CONSOLE_CONF_FMT = "file://server.{0}.conf" -SRC_URI:append:kudo = " ${@compose_list(d, 'CONSOLE_CONF_FMT', 'HOST_CONSOLE_TTY')}" -SRC_URI:append:kudo = " file://${BPN}@.service" -SRC_URI:append:kudo = " file://kudo_uart_mux_ctrl.sh" +SRC_URI:append:kudo = " file://${BPN}@.service \ + file://kudo_uart_mux_ctrl.sh \ + " SYSTEMD_SERVICE:${PN}:append:kudo = " \ - ${PN}@.service \ + ${BPN}@.service \ " do_install:append() { - for i in ${HOST_CONSOLE_TTY} - do - install -m 0644 ${WORKDIR}/server.${i}.conf ${D}${sysconfdir}/${BPN}/server.${i}.conf - done - - # Deal with files installed by the base package's .bb install function - rm -f ${D}${sysconfdir}/${BPN}.conf - rm -f ${D}${sysconfdir}/${BPN}/server.ttyVUART0.conf - # Overwrite base package's obmc-console@.service with our own install -m 0644 ${WORKDIR}/${BPN}@.service ${D}${systemd_unitdir}/system/${BPN}@.service install -d ${D}${libexecdir}/${PN} install -m 0755 ${WORKDIR}/kudo_uart_mux_ctrl.sh ${D}${libexecdir}/${PN}/kudo_uart_mux_ctrl.sh - } pkg_postinst:${PN}:append () { |