diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd_242.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd_242.bb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index 7d1b0ec13a..a6b39d57e8 100644 --- a/meta/recipes-core/systemd/systemd_242.bb +++ b/meta/recipes-core/systemd/systemd_242.bb | |||
@@ -277,13 +277,6 @@ do_install() { | |||
277 | fi | 277 | fi |
278 | fi | 278 | fi |
279 | 279 | ||
280 | # conf files are handled by systemd-conf | ||
281 | rm -f ${D}${sysconfdir}/systemd/coredump.conf | ||
282 | rm -f ${D}${sysconfdir}/systemd/journald.conf | ||
283 | rm -f ${D}${sysconfdir}/systemd/logind.conf | ||
284 | rm -f ${D}${sysconfdir}/systemd/system.conf | ||
285 | rm -f ${D}${sysconfdir}/systemd/user.conf | ||
286 | |||
287 | # duplicate udevadm for postinst script | 280 | # duplicate udevadm for postinst script |
288 | install -d ${D}${libexecdir} | 281 | install -d ${D}${libexecdir} |
289 | ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm | 282 | ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm |
@@ -486,6 +479,15 @@ FILES_${PN}-extra-utils = "\ | |||
486 | ${rootlibexecdir}/systemd/systemd-cgroups-agent \ | 479 | ${rootlibexecdir}/systemd/systemd-cgroups-agent \ |
487 | " | 480 | " |
488 | 481 | ||
482 | CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ | ||
483 | ${sysconfdir}/systemd/journald.conf \ | ||
484 | ${sysconfdir}/systemd/logind.conf \ | ||
485 | ${sysconfdir}/systemd/system.conf \ | ||
486 | ${sysconfdir}/systemd/user.conf \ | ||
487 | ${sysconfdir}/systemd/resolved.conf \ | ||
488 | ${sysconfdir}/systemd/timesyncd.conf \ | ||
489 | " | ||
490 | |||
489 | FILES_${PN} = " ${base_bindir}/* \ | 491 | FILES_${PN} = " ${base_bindir}/* \ |
490 | ${base_sbindir}/shutdown \ | 492 | ${base_sbindir}/shutdown \ |
491 | ${base_sbindir}/halt \ | 493 | ${base_sbindir}/halt \ |
@@ -549,7 +551,7 @@ FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ $ | |||
549 | 551 | ||
550 | RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck" | 552 | RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck" |
551 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" | 553 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" |
552 | RDEPENDS_${PN} += "volatile-binds update-rc.d systemd-conf" | 554 | RDEPENDS_${PN} += "volatile-binds update-rc.d" |
553 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'myhostname', 'libnss-myhostname', '', d)}" | 555 | RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'myhostname', 'libnss-myhostname', '', d)}" |
554 | 556 | ||
555 | RRECOMMENDS_${PN} += "systemd-extra-utils \ | 557 | RRECOMMENDS_${PN} += "systemd-extra-utils \ |
@@ -557,6 +559,7 @@ RRECOMMENDS_${PN} += "systemd-extra-utils \ | |||
557 | e2fsprogs-e2fsck \ | 559 | e2fsprogs-e2fsck \ |
558 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ | 560 | kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 \ |
559 | os-release \ | 561 | os-release \ |
562 | systemd-conf \ | ||
560 | " | 563 | " |
561 | 564 | ||
562 | INSANE_SKIP_${PN} += "dev-so libdir" | 565 | INSANE_SKIP_${PN} += "dev-so libdir" |