From d6eff077c4a3afbe39f8ee1b2ad1a19a716ce31c Mon Sep 17 00:00:00 2001 From: Thuy Tran Date: Wed, 1 Nov 2017 13:50:54 +0700 Subject: rcar-gen3: systemd: WORKAROUND to fix timeout dev-ttySN.device This commit makes backporting changes from upstream systemd to fix timeout dev-ttySN.device by following: [systemd] - Set journal RuntimeMaxSize to 64M as default [1] [systemd-serialgetty] - Use the default RestartSec [2] [1] From Poky rev: d41968d8a8bd572b2892762f7092868950465014 [2] From Systemd rev: 4bf04322b8b7ecca4f3d65cfc642d0ac16356129 Signed-off-by: Thuy Tran Signed-off-by: Takamitsu Honda --- meta-rcar-gen3/recipes-core/systemd/systemd-serialgetty.bbappend | 6 ++++++ meta-rcar-gen3/recipes-core/systemd/systemd_%.bbappend | 8 ++++++++ 2 files changed, 14 insertions(+) create mode 100644 meta-rcar-gen3/recipes-core/systemd/systemd-serialgetty.bbappend diff --git a/meta-rcar-gen3/recipes-core/systemd/systemd-serialgetty.bbappend b/meta-rcar-gen3/recipes-core/systemd/systemd-serialgetty.bbappend new file mode 100644 index 0000000..f8d6e66 --- /dev/null +++ b/meta-rcar-gen3/recipes-core/systemd/systemd-serialgetty.bbappend @@ -0,0 +1,6 @@ +# W/A to fix serial-getty@.service timeout +do_install_append () { + sed -e "/Before=getty.target/a Before=getty@tty1.service" \ + -e "/.*RestartSec.*/d" \ + -i ${D}${systemd_unitdir}/system/serial-getty@.service +} diff --git a/meta-rcar-gen3/recipes-core/systemd/systemd_%.bbappend b/meta-rcar-gen3/recipes-core/systemd/systemd_%.bbappend index f414a2b..1fe259a 100644 --- a/meta-rcar-gen3/recipes-core/systemd/systemd_%.bbappend +++ b/meta-rcar-gen3/recipes-core/systemd/systemd_%.bbappend @@ -1 +1,9 @@ PACKAGECONFIG_remove = "timesyncd" + +# Set journal RuntimeMaxSize to 64M as default to fix timeout +# dev-ttySN.device's when enable debug and use journal +# as systemd.log_target +do_install_append () { + sed -e 's/.*RuntimeMaxUse.*/RuntimeMaxUse=64M/' \ + -i ${D}${sysconfdir}/systemd/journald.conf +} -- cgit 1.2.3-korg