diff options
author | Christian Taedcke <christian.taedcke@weidmueller.com> | 2024-03-05 09:45:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-06 12:13:16 +0000 |
commit | e9870028b71c1794cba59c99bc6477e3cfacab24 (patch) | |
tree | 63f4e30ca551a05977c026eb62f8dc5ea64f353d /meta | |
parent | d4b3316cf16867a28785e381b6aac3f56dabf106 (diff) | |
download | poky-e9870028b71c1794cba59c99bc6477e3cfacab24.tar.gz |
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 <christian.taedcke@weidmueller.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes-recipe/image_types.bbclass | 4 |
1 files 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}/${ | |||
133 | # can (e.g. device files, symlinks, etc.) and therefore it not suitable for all | 133 | # can (e.g. device files, symlinks, etc.) and therefore it not suitable for all |
134 | # use cases | 134 | # use cases |
135 | oe_mkvfatfs () { | 135 | oe_mkvfatfs () { |
136 | mkfs.vfat $@ -C ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.vfat ${ROOTFS_SIZE} | 136 | mkfs.vfat $@ -C ${IMGDEPLOYDIR}/${IMAGE_NAME}.vfat ${ROOTFS_SIZE} |
137 | mcopy -i "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.vfat" -vsmpQ ${IMAGE_ROOTFS}/* ::/ | 137 | mcopy -i "${IMGDEPLOYDIR}/${IMAGE_NAME}.vfat" -vsmpQ ${IMAGE_ROOTFS}/* ::/ |
138 | } | 138 | } |
139 | 139 | ||
140 | IMAGE_CMD:vfat = "oe_mkvfatfs ${EXTRA_IMAGECMD}" | 140 | IMAGE_CMD:vfat = "oe_mkvfatfs ${EXTRA_IMAGECMD}" |