From 6b5b341a3826dab946544f73b8379a19e03ce705 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 23 Feb 2024 13:21:10 +0100 Subject: [PATCH] psplash: fix bbappend for different distro than "dey" This commit fixes a build issue using meta-digi layer with a different distro than "dey". Also simplified the bbappend to avoid creating a custom do_patch_png() task before do_configure(). Reported-by: Stephan Klatt Signed-off-by: Arturo Buzarra --- .../recipes-core/psplash/psplash_git.bbappend | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend b/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend index faec597c5..0adb42245 100644 --- a/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend +++ b/meta-digi-dey/recipes-core/psplash/psplash_git.bbappend @@ -1,12 +1,12 @@ -# Copyright (C) 2016 Digi International +# Copyright (C) 2016-2024 Digi International Inc. FILESEXTRAPATHS:prepend:dey := "${THISDIR}/files:" -SRC_URI += " \ +SRC_URI:append:dey = " \ file://0001-colors-modify-psplash-colors-to-match-Digi-scheme.patch \ file://psplash-digi-bar.png \ " -do_patch_png () { - cp ${WORKDIR}/psplash-digi-bar.png ${S}/base-images/psplash-bar.png + +do_configure:prepend:dey() { + \cp --remove-destination ${WORKDIR}/psplash-digi-bar.png ${S}/base-images/psplash-bar.png } -addtask patch_png after do_patch before do_configure