diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2019-09-20 09:25:27 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-27 13:02:16 +0100 |
commit | 4137f5978d31a80f46b8fea1e492a04f03a53fa8 (patch) | |
tree | a669edef5120c5c2fce79da1e57a00738ecb5dc2 /meta/recipes-core | |
parent | 47c3142515e505a147fb8b73123b4c9700a0bf68 (diff) | |
download | poky-4137f5978d31a80f46b8fea1e492a04f03a53fa8.tar.gz |
systemd: Make it build with hwdb disabled
If hwdb is disabled, then systemd-hwdb-update.service does not exists.
Do not try to modify it in this case.
(From OE-Core rev: 9f9706d39713f967e10e3a41313ddacb03b0ca94)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd_243.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-core/systemd/systemd_243.bb b/meta/recipes-core/systemd/systemd_243.bb index f0e8c569b8..d0f9d17dba 100644 --- a/meta/recipes-core/systemd/systemd_243.bb +++ b/meta/recipes-core/systemd/systemd_243.bb | |||
@@ -299,9 +299,10 @@ do_install() { | |||
299 | } | 299 | } |
300 | 300 | ||
301 | do_install_append () { | 301 | do_install_append () { |
302 | # Mips qemu is extremely slow, allow more time for the hwdb update | 302 | # Mips qemu is extremely slow, allow more time for the hwdb update |
303 | # This is a workaround until https://github.com/systemd/systemd/issues/13581 is resolved | 303 | # This is a workaround until https://github.com/systemd/systemd/issues/13581 is resolved |
304 | sed -i -e s#TimeoutSec=90s#TimeoutSec=180s# ${D}${systemd_unitdir}/system/systemd-hwdb-update.service | 304 | [ ! -e ${D}${systemd_unitdir}/system/systemd-hwdb-update.service ] || |
305 | sed -i -e s#TimeoutSec=90s#TimeoutSec=180s# ${D}${systemd_unitdir}/system/systemd-hwdb-update.service | ||
305 | } | 306 | } |
306 | 307 | ||
307 | python populate_packages_prepend (){ | 308 | python populate_packages_prepend (){ |