From e9870028b71c1794cba59c99bc6477e3cfacab24 Mon Sep 17 00:00:00 2001 From: Christian Taedcke Date: Tue, 5 Mar 2024 09:45:40 +0100 Subject: image_types.bbclass: fix vfat image names Remove the appended ${IMAGE_NAME_SUFFIX}, since it is already included in ${IMAGE_NAME}. In commit 26d97acc7137 ("image-artifact-names: include ${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and ${IMAGE_LINK_NAME}") ${IMAGE_NAME_SUFFIX} was included into ${IMAGE_NAME}. In this commit all other filesystems in image_types.bbclass were adapted. (From OE-Core rev: e3460853cdeae78762b31c6a846210f134bcd9ef) Signed-off-by: Christian Taedcke Signed-off-by: Richard Purdie --- meta/classes-recipe/image_types.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 4ad13b4367..913cb8788c 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -133,8 +133,8 @@ IMAGE_CMD:erofs-lz4hc = "mkfs.erofs -zlz4hc ${EXTRA_IMAGECMD} ${IMGDEPLOYDIR}/${ # can (e.g. device files, symlinks, etc.) and therefore it not suitable for all # use cases oe_mkvfatfs () { - mkfs.vfat $@ -C ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.vfat ${ROOTFS_SIZE} - mcopy -i "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.vfat" -vsmpQ ${IMAGE_ROOTFS}/* ::/ + mkfs.vfat $@ -C ${IMGDEPLOYDIR}/${IMAGE_NAME}.vfat ${ROOTFS_SIZE} + mcopy -i "${IMGDEPLOYDIR}/${IMAGE_NAME}.vfat" -vsmpQ ${IMAGE_ROOTFS}/* ::/ } IMAGE_CMD:vfat = "oe_mkvfatfs ${EXTRA_IMAGECMD}" -- cgit v1.2.3-54-g00ecf