Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

genimage: support IMAGE_NAME_SUFFIX #123

Merged
merged 1 commit into from
Apr 30, 2024

Conversation

Emantor
Copy link
Member

@Emantor Emantor commented Dec 12, 2023

Since nanbield 1, IMAGE_NAME and IMAGE_LINK_NAME include the IMAGE_NAME_SUFFIX, which means that the rootfs files gain an additional .rootfs suffix. Add support for this in genimage.

@rohieb
Copy link
Contributor

rohieb commented Dec 12, 2023

For refrerence, the default is set in poky/meta/classes-recipe/image-artifact-names.bbclass.

Copy link
Member

@Bastian-Krause Bastian-Krause left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The functional change looks good to me.

GENIMAGE_ROOTFS_IMAGE and GENIMAGE_ROOTFS_IMAGE_FSTYPE are documented. We should do the same for GENIMAGE_ROOTFS_IMAGE_SUFFIX, maybe with @rohieb's link?

We don't have a mickledore branch, yet. That means mickledore users currently stick to master. This change will break their rootfs unpacking, right? Maybe add a mickledore branch before merging this?

@Emantor
Copy link
Member Author

Emantor commented Dec 12, 2023

  • pushed a mickledore branch
  • added a commit which removes mickledore from layerseries-compat
  • added documentation for the new variable

@Emantor
Copy link
Member Author

Emantor commented Dec 12, 2023

Fixed the typo.

@Bastian-Krause Bastian-Krause mentioned this pull request Jan 5, 2024
@ejoerns ejoerns force-pushed the topic/genimage-image-suffix branch from 33cd91e to e637e04 Compare April 21, 2024 22:06
@ejoerns
Copy link
Member

ejoerns commented Apr 21, 2024

Rebased on master.

Since nanbield [1], IMAGE_NAME and IMAGE_LINK_NAME include the
IMAGE_NAME_SUFFIX, which means that the rootfs files gain an additional
.rootfs suffix. Add support for this in genimage.

[1]: https://docs.yoctoproject.org/4.3.1/migration-guides/migration-4.3.html#output-file-naming-changes

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
@ejoerns ejoerns force-pushed the topic/genimage-image-suffix branch from e637e04 to fc6db2f Compare April 21, 2024 22:35
@ejoerns
Copy link
Member

ejoerns commented Apr 21, 2024

This is now reworked to define

GENIMAGE_ROOTFS_IMAGE_SUFFIX ?= "${IMAGE_NAME_SUFFIX}"

I'm not fully sure if it needs a variable or if we can just rely directly on IMAGE_NAME_SUFFIX here.

Note that the same change would be useful for IMAGE_MACHINE_SUFFIX then.

Copy link
Member

@Bastian-Krause Bastian-Krause left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Haven't tested it because I have no recent Yocto BSP (using genimage) at hand.

@ejoerns ejoerns merged commit 831962e into pengutronix:master Apr 30, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants