From 8414615cd799013fbc0662d4ff8f82219afb71ce Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 4 Aug 2020 13:50:50 +0200 Subject: sota_raspberrypi: Use new variable for bootfiles path. This was changed in a907c3261ef583f898803706cd596d372c6644cb of meta-raspberrypi. This also requires 0b5292d13692ba074dc85227233e3a819d944204 in meta-updater-raspberrypi. Signed-off-by: Patrick Vacek --- classes/sota_raspberrypi.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass index 744ba22..3935ba8 100644 --- a/classes/sota_raspberrypi.bbclass +++ b/classes/sota_raspberrypi.bbclass @@ -39,11 +39,12 @@ def make_dtb_boot_files(d): return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) -IMAGE_BOOT_FILES_sota = "bcm2835-bootfiles/* \ +IMAGE_BOOT_FILES_sota = "${BOOTFILES_DIR_NAME}/* \ u-boot.bin;${SDIMG_KERNELIMAGE} \ " -# OSTree puts its own boot.scr to bcm2835-bootfiles +# OSTree puts its own boot.scr in ${BOOTFILES_DIR_NAME} (historically +# bcm2835-bootfiles, now just bootfiles). # rpi4 and recent rpi3 firmwares needs dtb in /boot partition # so that they can be read by the firmware IMAGE_BOOT_FILES_append_sota = "${@make_dtb_boot_files(d)}" -- cgit v1.2.3-54-g00ecf