Merge pull request #760 from advancedtelematic/fix/master/rpi-bootfiles-append

sota_raspberrypi: Use new variable for bootfiles path.

1 files 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)}"