]> code.ossystems Code Review - openembedded-core.git/commitdiff
systemd: Package systemd-hwdb-update.service into udev
authorKhem Raj <raj.khem@gmail.com>
Mon, 6 Apr 2020 06:53:14 +0000 (23:53 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 6 Apr 2020 13:46:55 +0000 (14:46 +0100)
Currently, this unit is packaged into udev-hwdb which then adds it as rdep
instead of rrecommends to systemd itself, this meant that even if we
added udev-hwdb to BAD_RECOMMENDATIONS, it would not be respected since
its a rdep, therefore move the service unit file into udev package
instead, this decouples the hard runtime dependency and restores the bad
recommendations expectations

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alex Kiernan <alex.kiernan@gmail.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/systemd/systemd_244.3.bb

index a68597284effc503fd86fb38e985b8480d500615..341ac6bbc51ba1caf5d2c08bf17b3c9c81ce6d7c 100644 (file)
@@ -628,14 +628,15 @@ FILES_udev += "${base_sbindir}/udevd \
                ${sysconfdir}/init.d/systemd-udevd \
                ${systemd_unitdir}/system/*udev* \
                ${systemd_unitdir}/system/*.wants/*udev* \
+               ${base_bindir}/systemd-hwdb \
                ${base_bindir}/udevadm \
                ${base_sbindir}/udevadm \
                ${libexecdir}/${MLPREFIX}udevadm \
                ${datadir}/bash-completion/completions/udevadm \
+               ${systemd_unitdir}/system/systemd-hwdb-update.service \
               "
 
 FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \
-                   ${systemd_unitdir}/system/systemd-hwdb-update.service \
                    "
 
 RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}"