summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2020-08-21 14:39:12 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-22 15:46:55 +0100
commita58ad4eb857449ee0e1b00ebaf29ba74f3c36a6f (patch)
treeeba8ac5671ce865b9adc39cce5280cec026a83e4 /meta
parentdd14862946e3820f224b00bbd7772917b2aca3e3 (diff)
downloadpoky-a58ad4eb857449ee0e1b00ebaf29ba74f3c36a6f.tar.gz
systemd: split systemd specific udev rules into its own package
In case some other packages need these udev rules but they wont install systemd, for instance, a issue was found that plymouth needs 71-seat.rules to be present in rootfs or it will fail. Let systemd RDEPENDS on systemd-udev-rules. (From OE-Core rev: a235b994deb20c312c5871e5c463ff963267d2ab) Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Ming Liu <ming.liu@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd_246.2.bb14
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/recipes-core/systemd/systemd_246.2.bb b/meta/recipes-core/systemd/systemd_246.2.bb
index 704a36e75d..238cd4741f 100644
--- a/meta/recipes-core/systemd/systemd_246.2.bb
+++ b/meta/recipes-core/systemd/systemd_246.2.bb
@@ -325,6 +325,7 @@ PACKAGE_BEFORE_PN = "\
325 ${PN}-journal-upload \ 325 ${PN}-journal-upload \
326 ${PN}-journal-remote \ 326 ${PN}-journal-remote \
327 ${PN}-extra-utils \ 327 ${PN}-extra-utils \
328 ${PN}-udev-rules \
328 udev \ 329 udev \
329 udev-hwdb \ 330 udev-hwdb \
330" 331"
@@ -499,6 +500,13 @@ FILES_${PN}-extra-utils = "\
499 ${rootlibexecdir}/systemd/systemd-cgroups-agent \ 500 ${rootlibexecdir}/systemd/systemd-cgroups-agent \
500" 501"
501 502
503FILES_${PN}-udev-rules = "\
504 ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \
505 ${rootlibexecdir}/udev/rules.d/71-seat.rules \
506 ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \
507 ${rootlibexecdir}/udev/rules.d/99-systemd.rules \
508"
509
502CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ 510CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \
503 ${sysconfdir}/systemd/journald.conf \ 511 ${sysconfdir}/systemd/journald.conf \
504 ${sysconfdir}/systemd/logind.conf \ 512 ${sysconfdir}/systemd/logind.conf \
@@ -554,10 +562,6 @@ FILES_${PN} = " ${base_bindir}/* \
554 ${exec_prefix}/lib/sysusers.d \ 562 ${exec_prefix}/lib/sysusers.d \
555 ${exec_prefix}/lib/environment.d \ 563 ${exec_prefix}/lib/environment.d \
556 ${localstatedir} \ 564 ${localstatedir} \
557 ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \
558 ${rootlibexecdir}/udev/rules.d/71-seat.rules \
559 ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \
560 ${rootlibexecdir}/udev/rules.d/99-systemd.rules \
561 ${rootlibexecdir}/modprobe.d/systemd.conf \ 565 ${rootlibexecdir}/modprobe.d/systemd.conf \
562 ${datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf \ 566 ${datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf \
563 ${datadir}/dbus-1/system.d/org.freedesktop.locale1.conf \ 567 ${datadir}/dbus-1/system.d/org.freedesktop.locale1.conf \
@@ -572,7 +576,7 @@ FILES_${PN} = " ${base_bindir}/* \
572 576
573FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd" 577FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
574 578
575RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck" 579RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck"
576RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}" 580RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}"
577RDEPENDS_${PN} += "volatile-binds" 581RDEPENDS_${PN} += "volatile-binds"
578 582