From: José Bollo <jose.bollo@iot.bzh>
Date: Thu, 14 Sep 2017 15:16:13 +0000 (+0200)
Subject: psplash: add animation and last message from systemd
X-Git-Tag: 4.99.1~5
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F11197%2F2;p=AGL%2Fmeta-agl.git

psplash: add animation and last message from systemd

An animated splash screen is cool.

Change-Id: I39c2404513aa6edd287df8555d46fe09e79f4408
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11197
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
---

diff --git a/meta-agl/recipes-core/psplash/files/psplash-anim b/meta-agl/recipes-core/psplash/files/psplash-anim
new file mode 100755
index 000000000..ac9bf674a
--- /dev/null
+++ b/meta-agl/recipes-core/psplash/files/psplash-anim
@@ -0,0 +1,11 @@
+#/bin/bash
+
+psplash-default "$@" &
+sleep .2
+while :; do
+	for x in 0 1 2 3 4 5 6 7 8 9 10 -9 -8 -7 -6 -5 -4 -3 -2 -1 0 -1 -2 -3 -4 -5 -6 -7 -8 -9 10 9 8 7 6 5 4 3 2 1; do
+		psplash-write "PROGRESS ${x}0" || exit 0
+		psplash-write "MSG $(journalctl -n1 -ocat)" || exit 0
+		sleep .1
+	done
+done
diff --git a/meta-agl/recipes-core/psplash/files/psplash-start.service b/meta-agl/recipes-core/psplash/files/psplash-start.service
index 67619d378..d3b6940d0 100644
--- a/meta-agl/recipes-core/psplash/files/psplash-start.service
+++ b/meta-agl/recipes-core/psplash/files/psplash-start.service
@@ -6,7 +6,7 @@ DefaultDependencies=no
 
 [Service]
 ExecStartPre=/bin/sh -c "if [ -e /sys/class/graphics/fbcon/cursor_blink ]; then echo 0 > /sys/class/graphics/fbcon/cursor_blink; fi"
-ExecStart=/usr/bin/psplash -n -a 90
+ExecStart=/bin/bash -c "/usr/bin/psplash-anim -n -a 90"
 
 [Install]
 WantedBy=sysinit.target
diff --git a/meta-agl/recipes-core/psplash/psplash_git.bbappend b/meta-agl/recipes-core/psplash/psplash_git.bbappend
index c2c58c562..bdc196b6f 100644
--- a/meta-agl/recipes-core/psplash/psplash_git.bbappend
+++ b/meta-agl/recipes-core/psplash/psplash_git.bbappend
@@ -3,6 +3,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI += "file://psplash-colors.h \
             file://psplash-start.service \
             file://psplash-quit.service \
+            file://psplash-anim \
             "
 
 SPLASH_IMAGES="file://psplash-poky-img.h;outsuffix=default"
@@ -22,4 +23,5 @@ do_install_append () {
         install -d ${D}${systemd_unitdir}/system
         install -m 644 ${WORKDIR}/*.service ${D}/${systemd_unitdir}/system
     fi
+    install -m 755 ${WORKDIR}/psplash-anim ${D}/${bindir}
 }