Skip to content

s390x: prepare for the upcoming 'pvimg' tool replacing 'genprotimg'#1597

Merged
nikita-dubrovskii merged 2 commits intocoreos:mainfrom
nikita-dubrovskii:pvimg
Feb 6, 2025
Merged

s390x: prepare for the upcoming 'pvimg' tool replacing 'genprotimg'#1597
nikita-dubrovskii merged 2 commits intocoreos:mainfrom
nikita-dubrovskii:pvimg

Conversation

@nikita-dubrovskii
Copy link
Contributor

Since s390-tools commit f4cf4ae6ebb1 (Remove genprotimg-C and switch to genprotimg-Rust implementation)
FCCOS/RHCOS may come with symlink to pvimg create.
New pvimg made some cmdline options obsolete (-V) and by default doesn't overwrite the output image (sdboot), which leads to an issue openshift/os#1731.

For now keep the call to genprotomg, even if it's symlink, but let's:

  • remove the sdboot before generating new one
  • use long cmdline options supported by both tool.

Copy link
Member

@travier travier left a comment

Choose a reason for hiding this comment

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

Some nits but mostly LGTM

Since s390-tools commit f4cf4ae6ebb1 ("rust: Add a new tool called 'pvimg'") the
C 'genprotimg' tool no longer exists and was replaced by symlink to Rust 'pvimg create',
which by default doens't overwrite the output image.
For backward compatibility let's silently remove the 'sdboot'.
Copy link

@hbrueckner hbrueckner left a comment

Choose a reason for hiding this comment

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

/lgtm
Thanks!

Copy link
Member

@travier travier left a comment

Choose a reason for hiding this comment

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

I only have limited context and did not test this but LGTM

@nikita-dubrovskii
Copy link
Contributor Author

I only have limited context and did not test this but LGTM

No worries, i've tested it locally

@nikita-dubrovskii nikita-dubrovskii merged commit bfef3a1 into coreos:main Feb 6, 2025
14 checks passed
@nikita-dubrovskii nikita-dubrovskii deleted the pvimg branch February 6, 2025 14:01
@mhartmay
Copy link

mhartmay commented Feb 6, 2025

LGTM, thanks for taking care!

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