u-boot_%.bbappend: fix conflicting boot.scr if UBOOT_ENV is set

When embedding meta-raspberry in a distro that uses UBOOT_ENV to ship their own custom boot.scr file, the current u-boot-default-script will make the build fail to build due to conflicts in $DEPLOY_DIR_IMAGE This patch fixes this by not adding u-boot-default-script to the u-boot DEPENDS if UBOOT_ENV is set. Signed-off-by: Alexander Sack <[email protected]>
agherzan · Apr 29, 2024 · 11b1f99 · 11b1f99
1 parent 1879cb8
commit 11b1f99
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -6,7 +6,7 @@ SRC_URI:append:rpi = " \
 
 SRC_URI:append:rpi = " file://0001-rpi-always-set-fdt_addr-with-firmware-provided-FDT-address.patch"
 
-DEPENDS:append:rpi = " u-boot-default-script"
+DEPENDS:append:rpi = " ${@oe.utils.conditional('UBOOT_ENV', '', 'u-boot-default-script', '', d)}"
 
 do_install:append:rpi () {
     install -d ${D}${sysconfdir}