Skip to content

Conversation

@ellie-di
Copy link
Contributor

@ellie-di ellie-di commented Oct 24, 2025

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

What does the PR accomplish, why was it needed?
This issue has blocked the September release, due to the following conflict issue.

tdnf install mlnx-ofa_kernel-hwe-modules

  1. package mlnx-ofa_kernel-hwe-modules-24.10-23_6.12.50.2.1.azl3.aarch64 conflicts with mlnx-ofa_kernel provided by mlnx-ofa_kernel-24.10-21_6.6.104.2.4.azl3.aarch64
    Found 1 problem(s) while resolving
Does this affect the toolchain?

NO

Associated issues
Test Methodology
  • Pipeline build id: xxxx

@ellie-di ellie-di requested a review from a team as a code owner October 24, 2025 22:44
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 fixes a package conflict issue that blocked the September release by correcting the conflict package name from mlnx-ofa_kernel to mlnx-ofa_kernel-modules in the mlnx-ofa_kernel-hwe-modules-signed spec file.

Key changes:

  • Updated the Conflicts directive to reference the correct package name that accurately represents the conflicting package

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

Requires: lsof
Requires: ofed-scripts
Conflicts: mlnx-ofa_kernel
Conflicts: mlnx-ofa_kernel-modules
Copy link
Contributor

@christopherco christopherco Oct 24, 2025

Choose a reason for hiding this comment

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

I couldn't find it, but is there the same Conflicts: in the mlnx-ofa_kernel-hwe spec where the -modules subpackage is being defined?
The expectation in all of the signed specs are to match 1-to-1 in Provides/Requires/Obsoletes/Files with their unsigned counterparts, so the -signed version is a direct replacement.

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