summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-04-05 23:53:14 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-06 14:46:55 +0100
commitbfaaefe8346e9f0eab153981fe6a3cc63590afb5 (patch)
tree08e1b95e94c46f453a8ba11e1d71e7d4f4dd16d1
parent79f7212ae71a4eb9e7abfe2c333b035ccc10e5c5 (diff)
downloadopenembedded-core-contrib-bfaaefe8346e9f0eab153981fe6a3cc63590afb5.tar.gz
systemd: Package systemd-hwdb-update.service into udev
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>
-rw-r--r--meta/recipes-core/systemd/systemd_244.3.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_244.3.bb b/meta/recipes-core/systemd/systemd_244.3.bb
index a68597284e..341ac6bbc5 100644
--- a/meta/recipes-core/systemd/systemd_244.3.bb
+++ b/meta/recipes-core/systemd/systemd_244.3.bb
@@ -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)}"