diff options
| -rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 6 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_243.bb | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 88f75d0f442..9323e92ab4f 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -36,6 +36,8 @@ POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" # Set default target for systemd images SYSTEMD_DEFAULT_TARGET ?= '${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "graphical.target", "multi-user.target", d)}' ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; systemd_create_users;", "", d)}' +# Mark /etc as updated for systemd as we have done things in rootfs time +ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd_mark_etc_updated;", "", d)}' ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;' @@ -86,6 +88,10 @@ systemd_create_users () { done } +systemd_mark_etc_updated () { + touch ${IMAGE_ROOTFS}${sysconfdir}/.updated +} + # # A hook function to support read-only-rootfs IMAGE_FEATURES # diff --git a/meta/recipes-core/systemd/systemd_243.bb b/meta/recipes-core/systemd/systemd_243.bb index f0e8c569b81..0148c37e454 100644 --- a/meta/recipes-core/systemd/systemd_243.bb +++ b/meta/recipes-core/systemd/systemd_243.bb @@ -298,12 +298,6 @@ do_install() { install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset } -do_install_append () { - # Mips qemu is extremely slow, allow more time for the hwdb update - # This is a workaround until https://github.com/systemd/systemd/issues/13581 is resolved - sed -i -e s#TimeoutSec=90s#TimeoutSec=180s# ${D}${systemd_unitdir}/system/systemd-hwdb-update.service -} - python populate_packages_prepend (){ systemdlibdir = d.getVar("rootlibdir") do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) |