From ca78d0c15953bbeb0f561147eb057a9836d99230 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 24 May 2021 11:13:29 +0200 Subject: systemd-conf: do not version in lockstep with systemd This is not needed as systemd-conf only packages standalone config files. (From OE-Core rev: 02bebaaf927e2cf5326bcae1de10cd4a82fd9495) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd-conf_1.0.bb | 43 +++++++++++++++++++++++++ meta/recipes-core/systemd/systemd-conf_247.6.bb | 41 ----------------------- 2 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 meta/recipes-core/systemd/systemd-conf_1.0.bb delete mode 100644 meta/recipes-core/systemd/systemd-conf_247.6.bb diff --git a/meta/recipes-core/systemd/systemd-conf_1.0.bb b/meta/recipes-core/systemd/systemd-conf_1.0.bb new file mode 100644 index 0000000000..235923be85 --- /dev/null +++ b/meta/recipes-core/systemd/systemd-conf_1.0.bb @@ -0,0 +1,43 @@ +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" + +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/ \ +" diff --git a/meta/recipes-core/systemd/systemd-conf_247.6.bb b/meta/recipes-core/systemd/systemd-conf_247.6.bb deleted file mode 100644 index ea35e83f4f..0000000000 --- a/meta/recipes-core/systemd/systemd-conf_247.6.bb +++ /dev/null @@ -1,41 +0,0 @@ -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" - -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/ \ -" -- cgit v1.2.3-54-g00ecf