From f8e1cabd4aae1b13e0373d716d8a8dbc0970bea8 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Tue, 26 Aug 2025 09:10:20 -0500 Subject: [PATCH] u-boot-imx: Exclude meta-freescale-3rdparty bbappend [YOCIMX-9248] The command `devtool modify u-boot-imx` fails because of a patch in meta-freescale-3rdparty: ``` ERROR: Applying patch '0001-Add-Olimex-iMX8MP-SOM-EVB-IND.patch' on target directory '/.../tmp/work/imx943_19x19_lpddr4_evk-poky-linux/u-boot-imx/2025.04/devtooltmp-2kb8sbhi/workdir/git' BBHandledException("Applying '0001-Add-Olimex-iMX8MP-SOM-EVB-IND.patch' failed: stdout: checking file arch/arm/dts/Makefile Hunk #1 FAILED at 1168. 1 out of 1 hunk FAILED checking file arch/arm/dts/imx8mp-olimex.dts checking file arch/arm/mach-imx/imx8m/Kconfig Hunk #1 succeeded at 500 (offset 54 lines). Hunk #2 FAILED at 492. 1 out of 2 hunks FAILED ``` The patch is not needed, so ignore the bbappend. Signed-off-by: Tom Hochstein (cherry picked from commit 07293042ece8e37ce29710de85055b9892b97ae5) --- meta-imx-bsp/conf/layer.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-imx-bsp/conf/layer.conf b/meta-imx-bsp/conf/layer.conf index f8a409f104..333c11547d 100644 --- a/meta-imx-bsp/conf/layer.conf +++ b/meta-imx-bsp/conf/layer.conf @@ -13,6 +13,8 @@ LAYERSERIES_COMPAT_fsl-bsp-release = "mickledore nanbield scarthgap styhead waln # Create a mirror for unreliable packages MIRRORS += "http://sourceforge.net/.* http://www.nxp.com/lgfiles/updates/other" +BBMASK += "meta-freescale-3rdparty/recipes-bsp/u-boot/u-boot-imx_%.bbappend" + # Define new EULAs and add them to the list defined in meta-freescale. # See fsl-eula-unpack.bbclass. FSL_EULA_FILE_MD5SUM_LA_OPT_NXP_SOFTWARE_LICENSE_V60 = "cf2070b16b9d4acf60a98e8cbc32a25a"