diff options
12 files changed, 169 insertions, 4 deletions
diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/hostconsole.conf b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/hostconsole.conf new file mode 100644 index 0000000000..6900a5d942 --- /dev/null +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/hostconsole.conf @@ -0,0 +1,91 @@ +#Host console log + +module(load="imuxsock" SysSock.Use="off") + +template(name="ConsoleTemplate" type="string" string="%rawmsg%") + +ruleset(name="ConsoleCPURuleset") { + action(type="omfile" file="/var/log/obmc-console-cpu.log" template="ConsoleTemplate") +} +ruleset(name="ConsoleATFRuleset") { + action(type="omfile" file="/var/log/obmc-console-atf.log" template="ConsoleTemplate") +} +ruleset(name="ConsoleSECPRO0Ruleset") { + action(type="omfile" file="/var/log/obmc-console-secpro0.log" template="ConsoleTemplate") +} +ruleset(name="ConsoleSECPRO1Ruleset") { + action(type="omfile" file="/var/log/obmc-console-secpro1.log" template="ConsoleTemplate") +} +ruleset(name="ConsoleMPRO0Ruleset") { + action(type="omfile" file="/var/log/obmc-console-mpro0.log" template="ConsoleTemplate") +} +ruleset(name="ConsoleMPRO1Ruleset") { + action(type="omfile" file="/var/log/obmc-console-mpro1.log" template="ConsoleTemplate") +} +ruleset(name="ConsoleSCP0Ruleset") { + action(type="omfile" file="/var/log/obmc-console-scp0.log" template="ConsoleTemplate") +} +ruleset(name="ConsoleSCP1Ruleset") { + action(type="omfile" file="/var/log/obmc-console-scp1.log" template="ConsoleTemplate") +} + +# Custom socket for serial console logs. +input(type="imuxsock" + Socket="/run/rsyslog/console/cpu" + CreatePath="on" + UseSpecialParser="off" + ParseHostname="off" + ruleset="ConsoleCPURuleset") + +input(type="imuxsock" + Socket="/run/rsyslog/console/atf" + CreatePath="on" + UseSpecialParser="off" + ParseHostname="off" + ruleset="ConsoleATFRuleset") + +input(type="imuxsock" + Socket="/run/rsyslog/console/secpro0" + CreatePath="on" + UseSpecialParser="off" + ParseHostname="off" + ruleset="ConsoleSECPRO0Ruleset") + +input(type="imuxsock" + Socket="/run/rsyslog/console/secpro1" + CreatePath="on" + UseSpecialParser="off" + ParseHostname="off" + ruleset="ConsoleSECPRO1Ruleset") + +input(type="imuxsock" + Socket="/run/rsyslog/console/mpro0" + CreatePath="on" + UseSpecialParser="off" + ParseHostname="off" + ruleset="ConsoleMPRO0Ruleset") + +input(type="imuxsock" + Socket="/run/rsyslog/console/mpro1" + CreatePath="on" + UseSpecialParser="off" + ParseHostname="off" + ruleset="ConsoleMPRO1Ruleset") + +input(type="imuxsock" + Socket="/run/rsyslog/console/scp0" + CreatePath="on" + UseSpecialParser="off" + ParseHostname="off" + ruleset="ConsoleSCP0Ruleset") + +input(type="imuxsock" + Socket="/run/rsyslog/console/scp1" + CreatePath="on" + UseSpecialParser="off" + ParseHostname="off" + ruleset="ConsoleSCP1Ruleset") + +$EscapeControlCharactersOnReceive off +$DropTrailingLFOnReception off + diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate index a6ba28d864..098236a8f5 100644 --- a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate @@ -20,3 +20,48 @@ systemctl reload rsyslog 2> /dev/null || true endscript } +# Keep up to 2 256k files for cpu console logs +/var/log/obmc-console-cpu.log +{ + copytruncate + rotate 1 + size 256k + missingok + postrotate + systemctl reload rsyslog 2> /dev/null || true + endscript +} +# Keep up to 2 64k files for atf console logs +/var/log/obmc-console-atf.log +{ + copytruncate + rotate 1 + size 64k + missingok + postrotate + systemctl reload rsyslog 2> /dev/null || true + endscript +} +# Keep up to 2 64k files for secpro and mpro console logs +/var/log/obmc-console-*pro*.log +{ + copytruncate + rotate 1 + size 64k + missingok + postrotate + systemctl reload rsyslog 2> /dev/null || true + endscript +} + +# Keep up to 2 64k files for Mt.Jade's scp console logs +/var/log/obmc-console-scp*.log +{ + copytruncate + rotate 1 + size 64k + missingok + postrotate + systemctl reload rsyslog 2> /dev/null || true + endscript +} diff --git a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend index 034ae3cfa7..863f314e28 100644 --- a/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend +++ b/meta-ampere/meta-common/recipes-extended/rsyslog/rsyslog_%.bbappend @@ -5,6 +5,7 @@ SRC_URI += "file://rsyslog.conf \ file://rotate-event-logs.service \ file://rotate-event-logs.sh \ file://rsyslog-override.conf \ + file://hostconsole.conf \ " FILES:${PN} += "${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf" @@ -18,6 +19,7 @@ do_install:append() { ${D}${systemd_system_unitdir}/rsyslog.service.d/rsyslog-override.conf install -d ${D}${bindir} install -m 0755 ${WORKDIR}/rotate-event-logs.sh ${D}/${bindir}/rotate-event-logs.sh + install -m 0755 ${WORKDIR}/hostconsole.conf ${D}${sysconfdir}/rsyslog.d/hostconsole.conf rm ${D}${sysconfdir}/rsyslog.d/imjournal.conf } diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf index 2d02a51387..2d80850416 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf @@ -1,3 +1,3 @@ +# socket-id is default to obmc-console local-tty = ttyS0 local-tty-baud = 115200 -logfile = /var/log/obmc-console-cpu.log diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf index a77188412b..6421f93397 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS1.conf @@ -1,4 +1,3 @@ local-tty = ttyS1 local-tty-baud = 115200 socket-id = ttyS1 -logfile = /var/log/obmc-console-scp0.log diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf index 7ac6953e40..f8be872f25 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS2.conf @@ -1,4 +1,3 @@ local-tty = ttyS2 local-tty-baud = 115200 socket-id = ttyS2 -logfile = /var/log/obmc-console-atf.log diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf index 0ec1b693b0..8f1ebbac73 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS3.conf @@ -1,4 +1,3 @@ local-tty = ttyS3 local-tty-baud = 115200 socket-id = ttyS3 -logfile = /var/log/obmc-console-scp1.log diff --git a/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS0.conf b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS0.conf new file mode 100644 index 0000000000..e0c10a42ed --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS0.conf @@ -0,0 +1,3 @@ +# SOCKET-ID is default to obmc-console +MODE=stream +STREAM_DST=/run/rsyslog/console/cpu diff --git a/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS1.conf b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS1.conf new file mode 100644 index 0000000000..faaf1a458e --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS1.conf @@ -0,0 +1,3 @@ +SOCKET_ID=ttyS1 +MODE=stream +STREAM_DST=/run/rsyslog/console/scp0 diff --git a/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS2.conf b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS2.conf new file mode 100644 index 0000000000..5d3cfb6828 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS2.conf @@ -0,0 +1,3 @@ +SOCKET_ID=ttyS2 +MODE=stream +STREAM_DST=/run/rsyslog/console/atf diff --git a/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS3.conf b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS3.conf new file mode 100644 index 0000000000..14bfd4b2c1 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger/ttyS3.conf @@ -0,0 +1,3 @@ +SOCKET_ID=ttyS3 +MODE=stream +STREAM_DST=/run/rsyslog/console/scp1 diff --git a/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend new file mode 100644 index 0000000000..38521ade21 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/hostlogger/phosphor-hostlogger_%.bbappend @@ -0,0 +1,18 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI:append = " \ + file://ttyS0.conf \ + file://ttyS1.conf \ + file://ttyS2.conf \ + file://ttyS3.conf \ + " + +do_install:append() { + + # Install the configurations + install -m 0755 -d ${D}${sysconfdir}/${BPN} + install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}/${BPN}/ + + # Remove upstream-provided default configuration + rm -f ${D}${sysconfdir}/${BPN}/ttyVUART0.conf +} |