summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2020-06-19 00:02:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-02 16:12:36 +0100
commit9b60a175fc74dc65f2d9c4c4d8687d2303501dde (patch)
tree33cade5bf0d4029bd41cbc08cccb8487a8be4ca5 /meta/recipes-core
parentb2fc2c658c0c7cbf0c2d6c3e3b5d2e68dd9567fb (diff)
downloadpoky-9b60a175fc74dc65f2d9c4c4d8687d2303501dde.tar.gz
systemd-serialgetty: do not use BindsTo
This unit was changed from 'BindsTo' in the following commit. """ commit f0f359ec9210759f6b4dbfb35d3fba8af208c43a Author: Jason Wessel <jason.wessel@windriver.com> Date: Thu Aug 29 07:00:31 2019 -0700 serial-getty@.service: Allow device to fast fail if it does not exist """ It was changed back to 'BindTo' in the following commit. """ commit 63bbff61b78c651339c4b18d8376187379ec3b3c Author: Otavio Salvador <otavio.salvador@gmail.com> Date: Fri Jun 12 14:30:44 2020 -0300 systemd: Sync systemd-serialgetty@.service with upstream """ This is now causing runtime problem for qemuarm64. The default.target is not reached until a timeout. Output is like below. """ root@qemuarm64:~# systemd-analyze Bootup is not yet finished (org.freedesktop.systemd1.Manager.FinishTimestampMonotonic=0). Please try again later. Hint: Use 'systemctl list-jobs' to see active jobs root@qemuarm64:~# systemctl list-jobs JOB UNIT TYPE STATE 102 getty.target start waiting 1 multi-user.target start waiting 95 systemd-update-utmp-runlevel.service start waiting 110 serial-getty@hvc0.service start waiting 111 dev-hvc0.device start running """ We can see that we are waiting for /dev/hvc0, while in fact there's no /dev/hvc0. Jason's commit actually solves such problem. So restore to use Jason's method. Do not use 'BindsTo'. (From OE-Core rev: b1d0eacc431517695c348ad14f4452be607c0b62) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 43b989c1231d3d867303ccebceda72364a9519ee) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service b/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
index 542b905795..549d566009 100644
--- a/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
+++ b/meta/recipes-core/systemd/systemd-serialgetty/serial-getty@.service
@@ -11,7 +11,8 @@
11Description=Serial Getty on %I 11Description=Serial Getty on %I
12Documentation=man:agetty(8) man:systemd-getty-generator(8) 12Documentation=man:agetty(8) man:systemd-getty-generator(8)
13Documentation=http://0pointer.de/blog/projects/serial-console.html 13Documentation=http://0pointer.de/blog/projects/serial-console.html
14BindsTo=dev-%i.device 14PartOf=dev-%i.device
15ConditionPathExists=/dev/%i
15After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target 16After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
16After=rc-local.service 17After=rc-local.service
17 18