Skip to content

flux warnings 2.0#13387

Merged
tobiasb-ms merged 2 commits intomainfrom
tobiasb-ms/flux-warnings-2.0
Apr 14, 2025
Merged

flux warnings 2.0#13387
tobiasb-ms merged 2 commits intomainfrom
tobiasb-ms/flux-warnings-2.0

Conversation

@tobiasb-ms
Copy link
Copy Markdown
Contributor

Merge Checklist

All boxes should be checked before merging the PR (just tick any boxes which don't apply to this PR)

  • The toolchain has been rebuilt successfully (or no changes were made to it)
  • The toolchain/worker package manifests are up-to-date
  • Any updated packages successfully build (or no packages were changed)
  • Packages depending on static components modified in this PR (Golang, *-static subpackages, etc.) have had their Release tag incremented.
  • Package tests (%check section) have been verified with RUN_CHECK=y for existing SPEC files, or added to new SPEC files
  • All package sources are available
  • cgmanifest files are up-to-date and sorted (./cgmanifest.json, ./toolkit/scripts/toolchain/cgmanifest.json, .github/workflows/cgmanifest.json)
  • LICENSE-MAP files are up-to-date (./LICENSES-AND-NOTICES/SPECS/data/licenses.json, ./LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md, ./LICENSES-AND-NOTICES/SPECS/LICENSE-EXCEPTIONS.PHOTON)
  • All source files have up-to-date hashes in the *.signatures.json files
  • sudo make go-tidy-all and sudo make go-test-coverage pass
  • Documentation has been updated to match any changes to the build system
  • Ready to merge

Summary

In the %prep section of the flux spec, it applies an inline patch using a heredoc with the ending token of EOF for the patch. This comes from upstream OpenSUSE. However, due to a copy-paste error in #4712 we don't have the ending EOF. This results in including the rest of the %prep script -- including the extra parts that rpmbuild itself adds that kills any outstanding jobs -- into the patch file. patch itself 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 the EOF.

Change Log
  • Fix EOF issue.
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

@tobiasb-ms tobiasb-ms requested a review from a team as a code owner April 14, 2025 20:52
@tobiasb-ms tobiasb-ms merged commit 4ac6507 into main Apr 14, 2025
13 checks passed
@tobiasb-ms tobiasb-ms deleted the tobiasb-ms/flux-warnings-2.0 branch April 14, 2025 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

main PR Destined for main Packaging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants