From 751495a8e8b24e8db61e653ce994a133927feb2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonatan=20P=C3=A5lsson?= Date: Wed, 22 Oct 2025 14:27:30 +0200 Subject: [PATCH] u-boot: Unconditionally add files/ to FILESEXTRAPATHS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This works around an issue where devtool doesn't find patches for machines other than the current machine. "devtool modify" tries to create git branches for each SRC_URI override (i.e. sunxi, sun9i, mangopi-mq-t-t113). When doing this devtool modifies the OVERRIDES for do_patch and filters out any other overrides used for SRC_URI in the current recipe. Since "sunxi" is used as an SRC_URI override it gets removed from OVERRIDES when processing e.g. sun9i, leading to FILESEXTRAPATHS not containing the patch directory for the recipe. By unconditionally setting FILESEXTRAPATHS without an override specified we work around this behavior and ensure all patches are always available when applying patches to the different devtool-override-* branches. Signed-off-by: Jonatan Pålsson --- recipes-bsp/u-boot/u-boot_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 896b6bc..a88ecbc 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS:prepend:sunxi := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" DEPENDS:append:sunxi = " bc-native dtc-native swig-native python3-native flex-native bison-native " DEPENDS:append:sun50i = " trusted-firmware-a"