LM
/
meta-netmodule-distro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

journald.conf: moved our journal config with updated header to systemd recipe 

moved journald.conf from systemd-conf to systemd and updated the
header for having the information about the drop-in files.

BugzID: 73568
Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmueller 2021-07-05 17:45:10 +02:00
parent bc5dbe7f48
commit 6fffac5fd4
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
recipes-core/systemd/systemd-conf/journald.conf → recipes-core/systemd/systemd/journald.conf
View File

@ -1,13 +1,16 @@
# 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.
# 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.
#
# Entries in this file show the compile time defaults.
# You can change settings by editing this file.
# Defaults can be restored by simply deleting this file.
# Entries in this file show the compile time defaults. Local configuration
# should be created by either modifying this file, or by creating "drop-ins" in
# the journald.conf.d/ subdirectory. The latter is generally recommended.
# Defaults can be restored by simply deleting this file and all drop-ins.
#
# Use 'systemd-analyze cat-config systemd/journald.conf' to display the full config.
#
# See journald.conf(5) for details.

13
recipes-core/systemd/systemd_%.bbappend
View File

@ -1,9 +1,22 @@
PACKAGECONFIG_remove = "nss-resolve resolved"
ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}"
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI_append = " \
file://journald.conf \
"
# The only reason for this line is to remove os-release from "dependencies" of systemd
# Having this dependency leads to a rebuild of systemd when os-release is rebuilt,
# even when the recommendations are excluded.
# It may not be required with future releases of yocto.
RRECOMMENDS_${PN}_remove = "os-release"
do_install_append() {
# Remove default network configurations
rm -rf ${D}${systemd_unitdir}/network
# bring our default config file in
install -d ${D}${sysconfdir}/systemd
install -m 644 ${WORKDIR}/journald.conf ${D}${sysconfdir}/systemd
}