From d7bf8c17eca8f8c89898a7794462c773c449e983 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 25 Feb 2018 22:55:05 -0500 Subject: Yocto 2.4 Move OpenBMC to Yocto 2.4(rocko) Tested: Built and verified Witherspoon and Palmetto images Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67 Signed-off-by: Brad Bishop --- .../yocto-poky/meta/recipes-core/psplash/files/psplash-init | 6 ++++++ import-layers/yocto-poky/meta/recipes-core/psplash/psplash_git.bb | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'import-layers/yocto-poky/meta/recipes-core/psplash') diff --git a/import-layers/yocto-poky/meta/recipes-core/psplash/files/psplash-init b/import-layers/yocto-poky/meta/recipes-core/psplash/files/psplash-init index 66c85e9335..0bce1de536 100755 --- a/import-layers/yocto-poky/meta/recipes-core/psplash/files/psplash-init +++ b/import-layers/yocto-poky/meta/recipes-core/psplash/files/psplash-init @@ -7,6 +7,12 @@ # Default-Stop: ### END INIT INFO +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 diff --git a/import-layers/yocto-poky/meta/recipes-core/psplash/psplash_git.bb b/import-layers/yocto-poky/meta/recipes-core/psplash/psplash_git.bb index 44297e1a69..3b7f818fc5 100644 --- a/import-layers/yocto-poky/meta/recipes-core/psplash/psplash_git.bb +++ b/import-layers/yocto-poky/meta/recipes-core/psplash/psplash_git.bb @@ -5,13 +5,14 @@ SECTION = "base" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6" -SRCREV = "88343ad23c90fa1dd8d79ac0d784a691aa0c6d2b" +SRCREV = "2015f7073e98dd9562db0936a254af5ef56356cf" PV = "0.1+git${SRCPV}" PR = "r15" SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://psplash-init \ ${SPLASH_IMAGES}" +UPSTREAM_VERSION_UNKNOWN = "1" SPLASH_IMAGES = "file://psplash-poky-img.h;outsuffix=default" -- cgit v1.2.3