diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-03-03 17:23:32 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.com> | 2021-03-04 16:24:38 +0000 |
commit | 853ccd744073fcc03a732c99b817fe1bd5b23327 (patch) | |
tree | 798efacb3c2e1d1e9d1e77430f6e2ad4754dfc21 | |
parent | 68976061c5c130ce68430a59c23afb8044975d41 (diff) | |
download | meta-raspberrypi-853ccd744073fcc03a732c99b817fe1bd5b23327.tar.gz |
sdcard_image-rpi.bbclass: shorten the default BOOTDD_VOLUME_ID
* raspberrypi4-64 is 15 characters and with dosfstools-4.2 it breaks rootfs.rpi-sdimg with:
mkfs.vfat: Label can be no longer than 11 characters
mkfs.fat 4.2 (2021-01-31)
* introduced in:
https://github.com/dosfstools/dosfstools/commit/c598354
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | classes/sdcard_image-rpi.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index e18a596..e803a0d 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
@@ -31,7 +31,9 @@ SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img" | |||
31 | SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img" | 31 | SDIMG_KERNELIMAGE_raspberrypi3-64 ?= "kernel8.img" |
32 | 32 | ||
33 | # Boot partition volume id | 33 | # Boot partition volume id |
34 | BOOTDD_VOLUME_ID ?= "${MACHINE}" | 34 | # Shorten raspberrypi to just rpi to keep it under 11 characters |
35 | # now enforced by mkfs.vfat from dosfstools-4.2 | ||
36 | BOOTDD_VOLUME_ID ?= "${@d.getVar('MACHINE').replace('raspberrypi', 'rpi')}" | ||
35 | 37 | ||
36 | # Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT) | 38 | # Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT) |
37 | BOOT_SPACE ?= "49152" | 39 | BOOT_SPACE ?= "49152" |