From 8e7233e89422428117723dc60091569a0a50d761 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 24 May 2024 02:08:53 +0200 Subject: [PATCH 1/2] rpi-u-boot-scr: use UNPACKDIR * see: https://lists.openembedded.org/g/openembedded-architecture/message/2007 * fixes: sed: can't read TOPDIR/BUILD/work/raspberrypi4_64-webos-linux/rpi-u-boot-scr/1.0/boot.cmd.in: No such file or directory Signed-off-by: Martin Jansa --- recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb b/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb index 1dff808b4..bbd873629 100644 --- a/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb +++ b/recipes-bsp/rpi-u-boot-scr/rpi-u-boot-scr.bb @@ -15,7 +15,7 @@ do_compile() { sed -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \ -e 's/@@KERNEL_BOOTCMD@@/${KERNEL_BOOTCMD}/' \ -e 's/@@BOOT_MEDIA@@/${BOOT_MEDIA}/' \ - "${WORKDIR}/boot.cmd.in" > "${WORKDIR}/boot.cmd" + "${UNPACKDIR}/boot.cmd.in" > "${WORKDIR}/boot.cmd" mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr } From b92951783c1b0dceb147a9a7153203b734156424 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 25 May 2024 09:18:58 +0200 Subject: [PATCH 2/2] layer.conf: declare compatibility only with styhead * we don't know yet what changes will be needed to stay compatible with final styhead, but we already know that the last changes for UNPACKDIR aren't compatible with scarthgap or nanbield. Signed-off-by: Martin Jansa --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index deea4a1a8..76f9e92d3 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "raspberrypi" BBFILE_PATTERN_raspberrypi := "^${LAYERDIR}/" BBFILE_PRIORITY_raspberrypi = "9" -LAYERSERIES_COMPAT_raspberrypi = "nanbield scarthgap" +LAYERSERIES_COMPAT_raspberrypi = "styhead" LAYERDEPENDS_raspberrypi = "core" # Recommended for u-boot support for raspberrypi5 # https://git.yoctoproject.org/meta-lts-mixins 'scarthgap/u-boot' branch