| Message ID | 20240430102448.1068114-1-r.czerwinski@pengutronix.de |
|---|---|
| State | New |
| Headers | show |
| Series | kernel-fitImage: use IMAGE_NAME_SUFFIX | expand |
Hi, please disregard this patch. Apparently the convention is for initramfs images to set IMAGE_NAME_SUFFIX ?= "", which lets kernel- fitimage.bbclass work as expected. Best regards, Rouven On Tue, 2024-04-30 at 12:24 +0200, Rouven Czerwinski wrote: > Without taking IMAGE_NAME_SUFFIX into account, the kernel-fitimage > class > will always fail to find the initramfs, fix the search path and error > message to include IMAGE_NAME_SUFFIX. > > Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> > --- > meta/classes-recipe/kernel-fitimage.bbclass | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/meta/classes-recipe/kernel-fitimage.bbclass > b/meta/classes-recipe/kernel-fitimage.bbclass > index 4b74ddc201..e0a26d26b9 100644 > --- a/meta/classes-recipe/kernel-fitimage.bbclass > +++ b/meta/classes-recipe/kernel-fitimage.bbclass > @@ -683,7 +683,7 @@ fitimage_assemble() { > # Find and use the first initramfs image archive > type we find > found= > for img in ${FIT_SUPPORTED_INITRAMFS_FSTYPES}; do > - > initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img" > + initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRA > MFS_IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$img" > if [ -e "$initramfs_path" ]; then > bbnote "Found initramfs image: > $initramfs_path" > found=true > @@ -695,7 +695,7 @@ fitimage_assemble() { > done > > if [ -z "$found" ]; then > - bbfatal "Could not find a valid initramfs > type for ${INITRAMFS_IMAGE_NAME}, the supported types are: > ${FIT_SUPPORTED_INITRAMFS_FSTYPES}" > + bbfatal "Could not find a valid initramfs > type for ${INITRAMFS_IMAGE_NAME}${IMAGE_NAME_SUFFIX}, the supported > types are: ${FIT_SUPPORTED_INITRAMFS_FSTYPES}" > fi > fi > > > base-commit: 7ef767d84d56b25498e45db83bb8f9d9caebeaf9 > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#198759): > https://lists.openembedded.org/g/openembedded-core/message/198759 > Mute This Topic: https://lists.openembedded.org/mt/105818094/3620320 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: > https://lists.openembedded.org/g/openembedded-core/unsub [ > rcz@pengutronix.de] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass index 4b74ddc201..e0a26d26b9 100644 --- a/meta/classes-recipe/kernel-fitimage.bbclass +++ b/meta/classes-recipe/kernel-fitimage.bbclass @@ -683,7 +683,7 @@ fitimage_assemble() { # Find and use the first initramfs image archive type we find found= for img in ${FIT_SUPPORTED_INITRAMFS_FSTYPES}; do - initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img" + initramfs_path="${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$img" if [ -e "$initramfs_path" ]; then bbnote "Found initramfs image: $initramfs_path" found=true @@ -695,7 +695,7 @@ fitimage_assemble() { done if [ -z "$found" ]; then - bbfatal "Could not find a valid initramfs type for ${INITRAMFS_IMAGE_NAME}, the supported types are: ${FIT_SUPPORTED_INITRAMFS_FSTYPES}" + bbfatal "Could not find a valid initramfs type for ${INITRAMFS_IMAGE_NAME}${IMAGE_NAME_SUFFIX}, the supported types are: ${FIT_SUPPORTED_INITRAMFS_FSTYPES}" fi fi
Without taking IMAGE_NAME_SUFFIX into account, the kernel-fitimage class will always fail to find the initramfs, fix the search path and error message to include IMAGE_NAME_SUFFIX. Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> --- meta/classes-recipe/kernel-fitimage.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 7ef767d84d56b25498e45db83bb8f9d9caebeaf9