Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Thud #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions recipes-core/psplash/customize.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Binary file modified recipes-core/psplash/files/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions recipes-core/psplash/psplash_%.bbappend
Original file line number Diff line number Diff line change
@@ -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} \
"

Expand Down Expand Up @@ -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("***********************************************");
Expand Down