Merged
Conversation
christopherco
approved these changes
Apr 14, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge Checklist
All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)
*-staticsubpackages, etc.) have had theirReleasetag incremented../cgmanifest.json,./toolkit/scripts/toolchain/cgmanifest.json,.github/workflows/cgmanifest.json)./LICENSES-AND-NOTICES/SPECS/data/licenses.json,./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md,./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)*.signatures.jsonfilessudo make go-tidy-allandsudo make go-test-coveragepassSummary
In the
%prepsection of the flux spec, it applies an inline patch using a heredoc with the ending token ofEOFfor the patch. This comes from upstream OpenSUSE. However, due to a copy-paste error in #4712 we don't have the endingEOF. This results in including the rest of the%prepscript -- including the extra parts thatrpmbuilditself adds that kills any outstanding jobs -- into the patch file.patchitself is smart enough to just ignore the "junk" at the end of a patch file, and warns about it. Fix for this is to add theEOF.Change Log
EOFissue.Does this affect the toolchain?
NO
Associated issues
Test Methodology
I built this before and after my changes (without bumping the release, since that's used to generate build ids) and proved that all files are binary same with and without these changes.
Buddy Build with no changes: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=787149&view=results
Buddy Build with changes: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=787176&view=results
Buddy Build with changes and spec bump: https://dev.azure.com/mariner-org/mariner/_build/results?buildId=787150&view=results