From 3ae288aa38e3a1609c6e861918a874416d3f0f13 Mon Sep 17 00:00:00 2001 From: Francois Retief Date: Fri, 29 Nov 2019 13:35:03 +0200 Subject: sdcard_image-rpi.bbclass: Use IMAGE_NAME_SUFFIX variable in SDIMG Use the IMAGE_NAME_SUFFIX variable to build the SDIMG name. Some layers, notably meta-mender, change the IMAGE_NAME_SUFFIX variable to something other that ".rootfs", causing build failures. Signed-off-by: Francois Retief --- classes/sdcard_image-rpi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index d344768..177988e 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass @@ -64,7 +64,7 @@ do_image_rpi_sdimg[depends] = " \ do_image_rpi_sdimg[recrdeps] = "do_build" # SD card image name -SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg" +SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg" # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. FATPAYLOAD ?= "" -- cgit v1.2.3-54-g00ecf