Merge branch 'hheinold/serial-2050'
We need to reduce the usage of ttyS0 to not conflict with the sysmobts-mgr that opens and controls the power amplifier. This is done by instructing systemd by config file to not log much and disable the getty target.
This commit is contained in:
commit
5b044d777b
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,43 @@
|
|||
# This file is part of systemd.
|
||||
#
|
||||
# systemd is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU Lesser General Public License as published by
|
||||
# the Free Software Foundation; either version 2.1 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# See systemd.conf(5) for details
|
||||
|
||||
[Manager]
|
||||
#LogLevel=info
|
||||
LogTarget=null
|
||||
#LogColor=yes
|
||||
#LogLocation=no
|
||||
#DumpCore=yes
|
||||
#CrashShell=no
|
||||
ShowStatus=no
|
||||
#CrashChVT=1
|
||||
#CPUAffinity=1 2
|
||||
#DefaultControllers=cpu
|
||||
DefaultStandardOutput=syslog
|
||||
DefaultStandardError=syslog
|
||||
#JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio
|
||||
RuntimeWatchdogSec=45
|
||||
#ShutdownWatchdogSec=10min
|
||||
#CapabilityBoundingSet=
|
||||
#TimerSlackNSec=
|
||||
#DefaultLimitCPU=
|
||||
#DefaultLimitFSIZE=
|
||||
#DefaultLimitDATA=
|
||||
#DefaultLimitSTACK=
|
||||
#DefaultLimitCORE=
|
||||
#DefaultLimitRSS=
|
||||
#DefaultLimitNOFILE=
|
||||
#DefaultLimitAS=
|
||||
#DefaultLimitNPROC=
|
||||
#DefaultLimitMEMLOCK=
|
||||
#DefaultLimitLOCKS=
|
||||
#DefaultLimitSIGPENDING=
|
||||
#DefaultLimitMSGQUEUE=
|
||||
#DefaultLimitNICE=
|
||||
#DefaultLimitRTPRIO=
|
||||
#DefaultLimitRTTIME=
|
|
@ -1,7 +1,7 @@
|
|||
S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
|
||||
FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
|
||||
|
||||
PRINC="19"
|
||||
PRINC="20"
|
||||
|
||||
SRC_URI += "file://journald.conf \
|
||||
file://0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch \
|
||||
|
@ -9,6 +9,7 @@ SRC_URI += "file://journald.conf \
|
|||
|
||||
SRC_URI_append_sysmobts-v1 = " file://system.conf"
|
||||
SRC_URI_append_sysmobts-v2 = " file://system.conf"
|
||||
SRC_URI_append_sysmobts-2050 = " file://system.conf"
|
||||
|
||||
# Disable depedency on dbus
|
||||
RDEPENDS_${PN}_remove = "dbus"
|
||||
|
@ -42,6 +43,20 @@ pkg_postinst_${PN}_append () {
|
|||
systemctl ${OPTS} mask systemd-journal-flush.service
|
||||
}
|
||||
|
||||
pkg_postinst_${PN}_append_sysmobts-2050 () {
|
||||
cd $D${sysconfdir}/init.d
|
||||
|
||||
echo "Disabling ttyS0 for sysmobts-2050:"
|
||||
|
||||
OPTS=""
|
||||
|
||||
if [ -n "$D" ]; then
|
||||
OPTS="--root=$D"
|
||||
fi
|
||||
|
||||
systemctl ${OPTS} mask serial-getty@ttyS0.service
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
install -m 0644 ${WORKDIR}/journald.conf ${D}${sysconfdir}/systemd/
|
||||
|
||||
|
|
Loading…
Reference in New Issue