diff --git a/recipes-core/initrdscripts/initramfs-scripts-android/init.machine.sh b/recipes-core/initrdscripts/initramfs-scripts-android/init.machine.sh deleted file mode 100644 index ca29a07..0000000 --- a/recipes-core/initrdscripts/initramfs-scripts-android/init.machine.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -echo QUIT > /run/psplash_fifo - -/usr/bin/psplash --angle $rotation --no-console-switch & - -BOOT_DIR=$1 - -sleep 1 - -/usr/bin/msm-fb-refresher diff --git a/recipes-core/initrdscripts/initramfs-scripts-android_1.0.bbappend b/recipes-core/initrdscripts/initramfs-scripts-android_1.0.bbappend index 3b62984..f1d37c3 100644 --- a/recipes-core/initrdscripts/initramfs-scripts-android_1.0.bbappend +++ b/recipes-core/initrdscripts/initramfs-scripts-android_1.0.bbappend @@ -3,23 +3,7 @@ COMPATIBLE_MACHINE:ray = "ray" RDEPENDS:${PN}:append:ray += "msm-fb-refresher" -SRC_URI:append:ray += " file://init.machine.sh" - -do_install:append:ray() { - install -m 0755 ${WORKDIR}/init.machine.sh ${D}/init.machine -} - -FILES:${PN} += "/init.machine" - FILESEXTRAPATHS:prepend:firefish := "${THISDIR}/${PN}:" COMPATIBLE_MACHINE:firefish = "firefish" RDEPENDS:${PN}:append:firefish += "msm-fb-refresher" - -SRC_URI:append:firefish += " file://init.machine.sh" - -do_install:append:firefish() { - install -m 0755 ${WORKDIR}/init.machine.sh ${D}/init.machine -} - -FILES:${PN} += "/init.machine" \ No newline at end of file diff --git a/recipes-core/psplash/psplash/0001-Disable-double-buffering.patch b/recipes-core/psplash/psplash/0001-Disable-double-buffering.patch deleted file mode 100644 index 5eaccbe..0000000 --- a/recipes-core/psplash/psplash/0001-Disable-double-buffering.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bdcb91c7982f39e67779ca87f704300514788a69 Mon Sep 17 00:00:00 2001 -From: MagneFire -Date: Tue, 13 Apr 2021 23:02:26 +0200 -Subject: [PATCH] Disable double buffering. Fixes black screen on some - platforms. - ---- - psplash-fb.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/psplash-fb.c b/psplash-fb.c -index 66bddee..1ad6cd1 100644 ---- a/psplash-fb.c -+++ b/psplash-fb.c -@@ -196,7 +196,8 @@ psplash_fb_new (int angle, int fbdev_id) - } - - /* Setup double virtual resolution for double buffering */ -- if (ioctl(fb->fd, FBIOPAN_DISPLAY, &fb_var) == -1) { -+ fb->double_buffering = 0; -+ /*if (ioctl(fb->fd, FBIOPAN_DISPLAY, &fb_var) == -1) { - fprintf(stderr, "FBIOPAN_DISPLAY not supported, double buffering disabled"); - } else { - if (fb_var.yres_virtual == fb_var.yres * 2) { -@@ -216,7 +217,7 @@ psplash_fb_new (int angle, int fbdev_id) - } - } - } -- } -+ }*/ - - fb->real_width = fb->width = fb_var.xres; - fb->real_height = fb->height = fb_var.yres; --- -2.31.1 - diff --git a/recipes-core/psplash/psplash_git.bbappend b/recipes-core/psplash/psplash_git.bbappend index db046bd..84b2edc 100644 --- a/recipes-core/psplash/psplash_git.bbappend +++ b/recipes-core/psplash/psplash_git.bbappend @@ -1,8 +1,13 @@ -FILESEXTRAPATHS:prepend:ray := "${THISDIR}/${PN}:" +SRC_URI:append:ray += " file://0002-Disable-double-buffering.patch" -SRC_URI:append:ray += " file://0001-Disable-double-buffering.patch" +do_install:append:ray() { + install -d ${D}/usr/share/ + install -m 0755 ${WORKDIR}/psplash-img-400-220.gif ${D}/usr/share/psplash.gif +} -FILESEXTRAPATHS:prepend:firefish := "${THISDIR}/${PN}:" +SRC_URI:append:firefish += " file://0002-Disable-double-buffering.patch" -SRC_URI:append:firefish += " file://0001-Disable-double-buffering.patch" -SPLASH_IMAGES = "file://psplash-img-280.png;outsuffix=default" \ No newline at end of file +do_install:append:firefish() { + install -d ${D}/usr/share/ + install -m 0755 ${WORKDIR}/psplash-img-400-220.gif ${D}/usr/share/psplash.gif +}