diff options
Diffstat (limited to 'meta/recipes-core/psplash/files')
4 files changed, 38 insertions, 55 deletions
diff --git a/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch b/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch deleted file mode 100644 index 93b3c6bc73..0000000000 --- a/meta/recipes-core/psplash/files/0001-psplash-fb-Convert-psplash_fb_plot_pixel-to-a-static.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8f5de12cc75bfaa8400adf32f30c015d8f813540 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 22 Aug 2015 07:12:20 -0700 -Subject: [PATCH] psplash-fb: Convert psplash_fb_plot_pixel() to a static - inline - -This function is not used outside psplash-fb.c and by making it -static inline we keep the performance and also make it portable across -multiple compilers and gcc versions - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - psplash-fb.c | 2 +- - psplash-fb.h | 8 -------- - 2 files changed, 1 insertion(+), 9 deletions(-) - -diff --git a/psplash-fb.c b/psplash-fb.c -index bd9cd9d..6d235db 100644 ---- a/psplash-fb.c -+++ b/psplash-fb.c -@@ -260,7 +260,7 @@ psplash_fb_new (int angle) - - #define OFFSET(fb,x,y) (((y) * (fb)->stride) + ((x) * ((fb)->bpp >> 3))) - --inline void -+static inline void - psplash_fb_plot_pixel (PSplashFB *fb, - int x, - int y, -diff --git a/psplash-fb.h b/psplash-fb.h -index 42592ed..c6c3144 100644 ---- a/psplash-fb.h -+++ b/psplash-fb.h -@@ -57,14 +57,6 @@ psplash_fb_destroy (PSplashFB *fb); - PSplashFB* - psplash_fb_new (int angle); - --inline void --psplash_fb_plot_pixel (PSplashFB *fb, -- int x, -- int y, -- uint8 red, -- uint8 green, -- uint8 blue); -- - void - psplash_fb_draw_rect (PSplashFB *fb, - int x, --- -2.1.4 - diff --git a/meta/recipes-core/psplash/files/psplash-init b/meta/recipes-core/psplash/files/psplash-init index 66c85e9335..e0f80bcdc0 100755 --- a/meta/recipes-core/psplash/files/psplash-init +++ b/meta/recipes-core/psplash/files/psplash-init @@ -7,6 +7,15 @@ # Default-Stop: ### END INIT INFO +. /etc/default/rcS +export PSPLASH_FIFO_DIR + +if [ ! -e /dev/fb0 ]; then + echo "Framebuffer /dev/fb0 not detected" + echo "Boot splashscreen disabled" + exit 0; +fi + read CMDLINE < /proc/cmdline for x in $CMDLINE; do case $x in @@ -17,8 +26,10 @@ for x in $CMDLINE; do esac done -export TMPDIR=/mnt/.psplash -mount tmpfs -t tmpfs $TMPDIR -o,size=40k +[ -d $PSPLASH_FIFO_DIR ] || mkdir -p $PSPLASH_FIFO_DIR +if ! mountpoint -q $PSPLASH_FIFO_DIR; then + mount tmpfs -t tmpfs $PSPLASH_FIFO_DIR -o,size=40k +fi rotation=0 if [ -e /etc/rotation ]; then diff --git a/meta/recipes-core/psplash/files/psplash-start.service b/meta/recipes-core/psplash/files/psplash-start.service new file mode 100644 index 0000000000..36c2bb38e0 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-start.service @@ -0,0 +1,12 @@ +[Unit] +Description=Start psplash boot splash screen +DefaultDependencies=no +RequiresMountsFor=/run + +[Service] +Type=notify +ExecStart=/usr/bin/psplash +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target diff --git a/meta/recipes-core/psplash/files/psplash-systemd.service b/meta/recipes-core/psplash/files/psplash-systemd.service new file mode 100644 index 0000000000..082207f232 --- /dev/null +++ b/meta/recipes-core/psplash/files/psplash-systemd.service @@ -0,0 +1,13 @@ +[Unit] +Description=Start psplash-systemd progress communication helper +DefaultDependencies=no +After=psplash-start.service +Requires=psplash-start.service +RequiresMountsFor=/run + +[Service] +ExecStart=/usr/bin/psplash-systemd +RemainAfterExit=yes + +[Install] +WantedBy=sysinit.target |