diff --git a/conf/layer.conf b/conf/layer.conf index e70a78e..05f3ce1 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "meta-splash" BBFILE_PATTERN_meta-splash = "^${LAYERDIR}/" -BBFILE_PRIORITY_meta-splash = "10" +BBFILE_PRIORITY_meta-splash = "12" LAYERDEPENDS_meta-splash = "core" -LAYERSERIES_COMPAT_meta-splash = "langdale kirkstone dunfell" +LAYERSERIES_COMPAT_meta-splash = "langdale kirkstone dunfell thud" diff --git a/recipes-core/psplash/customize.bb b/recipes-core/psplash/customize.bb index 7f29fec..28da859 100644 --- a/recipes-core/psplash/customize.bb +++ b/recipes-core/psplash/customize.bb @@ -14,6 +14,6 @@ BAR_BACKGROUND_COLOR = "0xff,0xff,0xff" # Overide MACHINE_PSPLASH_PKG name # add you own override if misssing -MACHINE_PSPLASH_PKG:qemuall = "default" -MACHINE_PSPLASH_PKG:qemux86-64 = "default" -MACHINE_PSPLASH_PKG:rpi = "raspberrypi" +#MACHINE_PSPLASH_PKG:qemuall = "default" +#MACHINE_PSPLASH_PKG:qemux86-64 = "default" +MACHINE_PSPLASH_PKG = "raspberrypi" diff --git a/recipes-core/psplash/files/logo.png b/recipes-core/psplash/files/logo.png index 15518ed..03a68c1 100644 Binary files a/recipes-core/psplash/files/logo.png and b/recipes-core/psplash/files/logo.png differ diff --git a/recipes-core/psplash/psplash_%.bbappend b/recipes-core/psplash/psplash_%.bbappend index 53f9080..9874ab6 100644 --- a/recipes-core/psplash/psplash_%.bbappend +++ b/recipes-core/psplash/psplash_%.bbappend @@ -1,7 +1,7 @@ include customize.bb MACHINE_PSPLASH_PKG ?= "default" -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SPLASH_IMAGES:forcevariable = "file://${SPLASH_IMAGE_NAME} \ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +SPLASH_IMAGES_forcevariable = "file://${SPLASH_IMAGE_NAME} \ file://${SPLASH_IMAGE_NAME};outsuffix=${MACHINE_PSPLASH_PKG} \ " @@ -35,7 +35,7 @@ python do_display_banner() { addtask display_banner before do_build -do_compile:prepend() { +do_compile_prepend() { bb.plain("***********************************************"); bb.plain("* Applying custom psplash colors *"); bb.plain("***********************************************");