diff options
| author | Francois Retief <fgretief@spaceteq.co.za> | 2019-11-29 13:35:03 +0200 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-12-05 12:45:02 +0000 |
| commit | 3ae288aa38e3a1609c6e861918a874416d3f0f13 (patch) | |
| tree | 4d3a7dca7d8cf86f7efe568552cd61b2cb87099b | |
| parent | ed6b75ba692b5d6bafd770f6669492db9cf97e37 (diff) | |
| download | meta-raspberrypi-3ae288aa38e3a1609c6e861918a874416d3f0f13.tar.gz | |
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 <fgretief@gmail.com>
| -rw-r--r-- | classes/sdcard_image-rpi.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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] = " \ | |||
| 64 | do_image_rpi_sdimg[recrdeps] = "do_build" | 64 | do_image_rpi_sdimg[recrdeps] = "do_build" |
| 65 | 65 | ||
| 66 | # SD card image name | 66 | # SD card image name |
| 67 | SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.rpi-sdimg" | 67 | SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg" |
| 68 | 68 | ||
| 69 | # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. | 69 | # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. |
| 70 | FATPAYLOAD ?= "" | 70 | FATPAYLOAD ?= "" |