Skip to content

Conversation

@Tonisal-byte
Copy link

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

Disables rust-toolset build requirement

Change Log
  • Added rust component toml
Does this affect the toolchain?

It does not.

Test Methodology

Successfully completed builds on stable koji deployment.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR moves Rust customization into a dedicated component file and disables the RHEL-specific rust-toolset build requirement via an overlay, aligning with the repo’s pattern of putting customized components under their own directories.

Changes:

  • Added a base/comps/rust/rust.comp.toml component definition with a spec overlay that removes %{?rhel:BuildRequires: rust-toolset}.
  • Removed the inline [components.rust] entry from base/comps/components.toml (now sourced via includes = ["**/*.comp.toml"]).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File Description
base/comps/rust/rust.comp.toml Defines the Rust component overlay to remove the RHEL-only rust-toolset BuildRequires line.
base/comps/components.toml Drops the old components.rust stub entry since Rust is now defined via the included .comp.toml.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copy link
Member

@reubeno reubeno left a comment

Choose a reason for hiding this comment

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

Let's hold off merging this until we can sort out whether the surgical overlay here is the Right fix to make.

@@ -0,0 +1,8 @@
[components.rust]

# Remove RHEL-specific rust-toolset BuildRequires (use Fedora's cargo-rpm-macros instead)
Copy link
Member

Choose a reason for hiding this comment

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

While this gets it to build, what's the impact of enabling all of the other blocks in the .spec conditional on rhel being defined (and/or a certain value)?

Let's sort out if the correct decision is to ensure that rhel is undefined for this spec. If that's the right call, we may need a new way to express that via the TOML files.

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