From 4ae392ad605fd63f5ffdaaa567608322f77269df Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 31 Mar 2020 19:37:09 -0400 Subject: meta-agl-profile-core: update psplash for dunfell Remove local systemd enablement changes for psplash in favor of using upstream support added in dunfell. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray Change-Id: I13a4b2523fe869898b2ccede793afd0cdefbab88 --- .../recipes-core/psplash/files/psplash-anim | 11 ----------- .../recipes-core/psplash/files/psplash-quit.service | 11 ----------- .../recipes-core/psplash/files/psplash-start.service | 12 ------------ 3 files changed, 34 deletions(-) delete mode 100755 meta-agl-profile-core/recipes-core/psplash/files/psplash-anim delete mode 100644 meta-agl-profile-core/recipes-core/psplash/files/psplash-quit.service delete mode 100644 meta-agl-profile-core/recipes-core/psplash/files/psplash-start.service (limited to 'meta-agl-profile-core/recipes-core/psplash/files') diff --git a/meta-agl-profile-core/recipes-core/psplash/files/psplash-anim b/meta-agl-profile-core/recipes-core/psplash/files/psplash-anim deleted file mode 100755 index ac9bf674a..000000000 --- a/meta-agl-profile-core/recipes-core/psplash/files/psplash-anim +++ /dev/null @@ -1,11 +0,0 @@ -#/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-profile-core/recipes-core/psplash/files/psplash-quit.service b/meta-agl-profile-core/recipes-core/psplash/files/psplash-quit.service deleted file mode 100644 index 14bd4994b..000000000 --- a/meta-agl-profile-core/recipes-core/psplash/files/psplash-quit.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Terminate Psplash Boot Screen -After=psplash-start.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/psplash-write QUIT -TimeoutSec=20 - -[Install] -WantedBy=multi-user.target diff --git a/meta-agl-profile-core/recipes-core/psplash/files/psplash-start.service b/meta-agl-profile-core/recipes-core/psplash/files/psplash-start.service deleted file mode 100644 index d3b6940d0..000000000 --- a/meta-agl-profile-core/recipes-core/psplash/files/psplash-start.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Start Psplash Boot Screen -Wants=systemd-vconsole-setup.service -After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service -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=/bin/bash -c "/usr/bin/psplash-anim -n -a 90" - -[Install] -WantedBy=sysinit.target -- cgit 1.2.3-korg