]> code.ossystems Code Review - openembedded-core.git/commitdiff
systemd: split systemd specific udev rules into its own package
authorMing Liu <ming.liu@toradex.com>
Fri, 21 Aug 2020 12:39:12 +0000 (14:39 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 22 Aug 2020 14:46:51 +0000 (15:46 +0100)
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.

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>
meta/recipes-core/systemd/systemd_246.2.bb

index 704a36e75d6d8865078d87293718b2d887330c94..238cd4741fc8e02f4e6dd0aeaad664a0b5b0e4eb 100644 (file)
@@ -325,6 +325,7 @@ PACKAGE_BEFORE_PN = "\
     ${PN}-journal-upload \
     ${PN}-journal-remote \
     ${PN}-extra-utils \
+    ${PN}-udev-rules \
     udev \
     udev-hwdb \
 "
@@ -499,6 +500,13 @@ FILES_${PN}-extra-utils = "\
                         ${rootlibexecdir}/systemd/systemd-cgroups-agent \
 "
 
+FILES_${PN}-udev-rules = "\
+                        ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \
+                        ${rootlibexecdir}/udev/rules.d/71-seat.rules \
+                        ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \
+                        ${rootlibexecdir}/udev/rules.d/99-systemd.rules \
+"
+
 CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \
        ${sysconfdir}/systemd/journald.conf \
        ${sysconfdir}/systemd/logind.conf \
@@ -554,10 +562,6 @@ FILES_${PN} = " ${base_bindir}/* \
                 ${exec_prefix}/lib/sysusers.d \
                 ${exec_prefix}/lib/environment.d \
                 ${localstatedir} \
-                ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \
-                ${rootlibexecdir}/udev/rules.d/71-seat.rules \
-                ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \
-                ${rootlibexecdir}/udev/rules.d/99-systemd.rules \
                 ${rootlibexecdir}/modprobe.d/systemd.conf \
                 ${datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf \
                 ${datadir}/dbus-1/system.d/org.freedesktop.locale1.conf \
@@ -572,7 +576,7 @@ FILES_${PN} = " ${base_bindir}/* \
 
 FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
 
-RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) util-linux-agetty util-linux-fsck"
+RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck"
 RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}"
 RDEPENDS_${PN} += "volatile-binds"