Merge commit '592c6d7295a24cd49bbf49fcbc089d261bc286af' into dora

This commit is contained in:
Holger Hans Peter Freyther 2015-02-15 14:43:03 +01:00
commit 6b2acc8c39
1 changed files with 16 additions and 3 deletions

View File

@ -11,7 +11,10 @@ SRC_URI += "file://journald.conf \
SRC_URI_append_sysmobts-v1 = " file://system.conf"
SRC_URI_append_sysmobts-v2 = " file://system.conf"
SRC_URI_append_sysmocom-odu = " file://system.conf"
# We want the journal on the ODU...
SRC_URI_append_sysmocom-idu = " file://system.conf"
SRC_URI_remove_sysmocom-idu = " file://0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch "
# Disable depedency on dbus
RDEPENDS_${PN}_remove = "dbus"
@ -22,6 +25,15 @@ SYSTEMD_DISABLED_NATIVE_SERVICES = " \
systemd-logind \
"
# disable journald as it isn't efficient
SYSMOCOM_DISABLED_JOURNALD_SERVICES = " \
systemd-journald.socket \
systemd-journald.service \
systemd-journal-flush.service \
"
SYSMOCOM_DISABLED_JOURNALD_SERVICES_sysmocom-idu = ""
pkg_postinst_${PN}_append () {
cd $D${sysconfdir}/init.d
@ -40,9 +52,10 @@ pkg_postinst_${PN}_append () {
done ; echo
# disable journald because its using to much cpu under stress logging
systemctl ${OPTS} mask systemd-journald.socket
systemctl ${OPTS} mask systemd-journald.service
systemctl ${OPTS} mask systemd-journal-flush.service
for i in ${SYSMOCOM_DISABLED_JOURNALD_SERVICES} ; do
systemctl ${OPTS} mask $i.service
done
}
do_install_append() {