| Message ID | 20240305084540.12235-1-christian.taedcke-oss@weidmueller.com |
|---|---|
| State | Accepted, archived |
| Commit | e3460853cdeae78762b31c6a846210f134bcd9ef |
| Headers | show |
| Series | image_types.bbclass: fix vfat image names | expand |
LGTM, I'm sorry I've missed it when updating other types. Signed-off-by: Martin Jansa <martin.jansa@gmail.com> On Tue, Mar 5, 2024 at 9:46 AM Taedcke, Christian <christian.taedcke-oss@weidmueller.com> wrote: > > From: Christian Taedcke <christian.taedcke@weidmueller.com> > > 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. > > Signed-off-by: Christian Taedcke <christian.taedcke@weidmueller.com> > --- > 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 3733bdfc20..1c3a88bd0f 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}" > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#196627): https://lists.openembedded.org/g/openembedded-core/message/196627 > Mute This Topic: https://lists.openembedded.org/mt/104740857/3617156 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [martin.jansa@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 3733bdfc20..1c3a88bd0f 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}"