Skip to content

Conversation

@dustymabe
Copy link
Member

This was released in OSBuild v167 and is now in the RPM in Fedora 43.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request disables the patch_osbuild function in build.sh by commenting out its entire implementation and adding a return statement. Previously, this function was responsible for applying a patch that modified stages/org.osbuild.coreos.live-artifacts.mono. The patch itself introduced a new find_efi_source_paths function to support updated EFI file locations under /usr/lib/efi/ (due to 'BootLoaderUpdatesPhase1') while maintaining compatibility with the legacy /usr/lib/bootupd/updates/EFI path, and updated mkefiboot and copy_configs_and_init_kargs_json to utilize this new EFI path discovery logic. With this change, the manual application of this EFI-related patch is no longer performed during the build process.

This was released in OSBuild v167 and is now in the RPM in Fedora 43.
@dustymabe dustymabe force-pushed the dusty-drop-osbuild-patch branch from 20d1b29 to 9d94a03 Compare December 22, 2025 14:11
@dustymabe dustymabe changed the title osubild: drop backport patch for grub2 efi changes osbuild: drop backport patch for grub2 efi changes Dec 22, 2025
Copy link
Member

@marmijo marmijo left a comment

Choose a reason for hiding this comment

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

LGTM

@dustymabe
Copy link
Member Author

rhcos tests are timing out. Probably coreos/rhel-coreos-config#132

merging this to unblock cosa builds (which are currently failing)

@dustymabe dustymabe merged commit c9a1e31 into coreos:main Dec 22, 2025
5 of 6 checks passed
@dustymabe dustymabe deleted the dusty-drop-osbuild-patch branch December 22, 2025 22:04
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.

2 participants