diff options
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r-- | meta/recipes-core/systemd/systemd_239.bb | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/meta/recipes-core/systemd/systemd_239.bb b/meta/recipes-core/systemd/systemd_239.bb index bc16407e09..acdce5cee7 100644 --- a/meta/recipes-core/systemd/systemd_239.bb +++ b/meta/recipes-core/systemd/systemd_239.bb | |||
@@ -282,6 +282,10 @@ do_install() { | |||
282 | rm -f ${D}${sysconfdir}/systemd/logind.conf | 282 | rm -f ${D}${sysconfdir}/systemd/logind.conf |
283 | rm -f ${D}${sysconfdir}/systemd/system.conf | 283 | rm -f ${D}${sysconfdir}/systemd/system.conf |
284 | rm -f ${D}${sysconfdir}/systemd/user.conf | 284 | rm -f ${D}${sysconfdir}/systemd/user.conf |
285 | |||
286 | # duplicate udevadm for postinst script | ||
287 | install -d ${D}${libexecdir} | ||
288 | ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm | ||
285 | } | 289 | } |
286 | 290 | ||
287 | 291 | ||
@@ -532,6 +536,7 @@ FILES_udev += "${base_sbindir}/udevd \ | |||
532 | ${systemd_unitdir}/system/*udev* \ | 536 | ${systemd_unitdir}/system/*udev* \ |
533 | ${systemd_unitdir}/system/*.wants/*udev* \ | 537 | ${systemd_unitdir}/system/*.wants/*udev* \ |
534 | ${base_bindir}/udevadm \ | 538 | ${base_bindir}/udevadm \ |
539 | ${libexecdir}/${MLPREFIX}udevadm \ | ||
535 | ${datadir}/bash-completion/completions/udevadm \ | 540 | ${datadir}/bash-completion/completions/udevadm \ |
536 | " | 541 | " |
537 | 542 | ||
@@ -570,13 +575,7 @@ pkg_prerm_${PN} () { | |||
570 | PACKAGE_WRITE_DEPS += "qemu-native" | 575 | PACKAGE_WRITE_DEPS += "qemu-native" |
571 | pkg_postinst_udev-hwdb () { | 576 | pkg_postinst_udev-hwdb () { |
572 | if test -n "$D"; then | 577 | if test -n "$D"; then |
573 | if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'true','false', d)}; then | 578 | $INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} |
574 | ${@qemu_run_binary(d, '$D', '${base_bindir}/udevadm')} hwdb --update \ | ||
575 | --root $D | ||
576 | chown root:root $D${sysconfdir}/udev/hwdb.bin | ||
577 | else | ||
578 | $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX} | ||
579 | fi | ||
580 | else | 579 | else |
581 | udevadm hwdb --update | 580 | udevadm hwdb --update |
582 | fi | 581 | fi |