diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-03-03 14:06:40 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-06 22:39:04 +0000 |
| commit | d8b2c8cee92b3200e9d78daf27b83d03ecc21108 (patch) | |
| tree | d92c6fa701814ce11a4ea375ed6f542f05e6fcac /meta/classes/rootfs-postcommands.bbclass | |
| parent | eab334ade5d38b3539f456c8cb55d1975e358791 (diff) | |
| download | poky-d8b2c8cee92b3200e9d78daf27b83d03ecc21108.tar.gz | |
rootfs-postcommands: correctly set systemd target for weston images
Otherwise, weston wouldn't actually start when systemd is in use.
(From OE-Core rev: 6b6287b7e5190d1af2e3aefddb2f72a8d0d79968)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs-postcommands.bbclass')
| -rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 1f27a3d07a..e66ed5938b 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
| @@ -34,7 +34,7 @@ ROOTFS_POSTUNINSTALL_COMMAND =+ "write_image_manifest ; " | |||
| 34 | # Set default postinst log file | 34 | # Set default postinst log file |
| 35 | POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" | 35 | POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" |
| 36 | # Set default target for systemd images | 36 | # Set default target for systemd images |
| 37 | SYSTEMD_DEFAULT_TARGET ?= '${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "graphical.target", "multi-user.target", d)}' | 37 | SYSTEMD_DEFAULT_TARGET ?= '${@bb.utils.contains_any("IMAGE_FEATURES", [ "x11-base", "weston" ], "graphical.target", "multi-user.target", d)}' |
| 38 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; systemd_create_users;", "", d)}' | 38 | ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; systemd_create_users;", "", d)}' |
| 39 | 39 | ||
| 40 | ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;' | 40 | ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;' |