diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-04-05 23:53:14 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-06 16:45:11 +0100 |
| commit | 69023571984e8594f5031f3e79770ff47b9162b4 (patch) | |
| tree | 7594f8fe81d799338d805b31ec6112f67ec89c34 | |
| parent | c4cd85ca3e07e1bcc2a55dfd519f62b6e7a596d6 (diff) | |
| download | poky-69023571984e8594f5031f3e79770ff47b9162b4.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
(From OE-Core rev: bfaaefe8346e9f0eab153981fe6a3cc63590afb5)
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.bb | 3 |
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 \ | |||
| 628 | ${sysconfdir}/init.d/systemd-udevd \ | 628 | ${sysconfdir}/init.d/systemd-udevd \ |
| 629 | ${systemd_unitdir}/system/*udev* \ | 629 | ${systemd_unitdir}/system/*udev* \ |
| 630 | ${systemd_unitdir}/system/*.wants/*udev* \ | 630 | ${systemd_unitdir}/system/*.wants/*udev* \ |
| 631 | ${base_bindir}/systemd-hwdb \ | ||
| 631 | ${base_bindir}/udevadm \ | 632 | ${base_bindir}/udevadm \ |
| 632 | ${base_sbindir}/udevadm \ | 633 | ${base_sbindir}/udevadm \ |
| 633 | ${libexecdir}/${MLPREFIX}udevadm \ | 634 | ${libexecdir}/${MLPREFIX}udevadm \ |
| 634 | ${datadir}/bash-completion/completions/udevadm \ | 635 | ${datadir}/bash-completion/completions/udevadm \ |
| 636 | ${systemd_unitdir}/system/systemd-hwdb-update.service \ | ||
| 635 | " | 637 | " |
| 636 | 638 | ||
| 637 | FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ | 639 | FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \ |
| 638 | ${systemd_unitdir}/system/systemd-hwdb-update.service \ | ||
| 639 | " | 640 | " |
| 640 | 641 | ||
| 641 | RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}" | 642 | RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}" |
