mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
Support for unmerged-usr is deprecated upstream, taints the system and has been removed for v255 (next release). Enforce building merged-usr images when using systemd. This allows one release cycle where it can be tested for any remaining issue, and can still be overridden, before it stops working completely. (From OE-Core rev: 802e853eeddf16d73db1900546cc5f045d1fb7ed) Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
47 lines
1.5 KiB
BlitzBasic
47 lines
1.5 KiB
BlitzBasic
SUMMARY = "Systemd system configuration"
|
|
DESCRIPTION = "Systemd may require slightly different configuration for \
|
|
different machines. For example, qemu machines require a longer \
|
|
DefaultTimeoutStartSec setting."
|
|
LICENSE = "MIT"
|
|
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
|
|
|
|
inherit features_check
|
|
REQUIRED_DISTRO_FEATURES += "usrmerge"
|
|
|
|
PE = "1"
|
|
|
|
PACKAGECONFIG ??= "dhcp-ethernet"
|
|
PACKAGECONFIG[dhcp-ethernet] = ""
|
|
|
|
SRC_URI = "\
|
|
file://journald.conf \
|
|
file://logind.conf \
|
|
file://system.conf \
|
|
file://system.conf-qemuall \
|
|
file://wired.network \
|
|
"
|
|
|
|
do_install() {
|
|
install -D -m0644 ${WORKDIR}/journald.conf ${D}${systemd_unitdir}/journald.conf.d/00-${PN}.conf
|
|
install -D -m0644 ${WORKDIR}/logind.conf ${D}${systemd_unitdir}/logind.conf.d/00-${PN}.conf
|
|
install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_unitdir}/system.conf.d/00-${PN}.conf
|
|
|
|
if ${@bb.utils.contains('PACKAGECONFIG', 'dhcp-ethernet', 'true', 'false', d)}; then
|
|
install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network
|
|
fi
|
|
}
|
|
|
|
# Based on change from YP bug 8141, OE commit 5196d7bacaef1076c361adaa2867be31759c1b52
|
|
do_install:append:qemuall() {
|
|
install -D -m0644 ${WORKDIR}/system.conf-qemuall ${D}${systemd_unitdir}/system.conf.d/01-${PN}.conf
|
|
}
|
|
|
|
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
|
|
|
FILES:${PN} = "\
|
|
${systemd_unitdir}/journald.conf.d/ \
|
|
${systemd_unitdir}/logind.conf.d/ \
|
|
${systemd_unitdir}/system.conf.d/ \
|
|
${systemd_unitdir}/network/ \
|
|
"
|