Skip to content

Adjust the conflict package name for mlnx-ofa_kernel-hwe-modules #14923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
Parent: Grab latest 3.0-dev to revert golang update.
wants to merge 2 commits into
base: 3.0-dev
Choose a base branch
from
Open

Adjust the conflict package name for mlnx-ofa_kernel-hwe-modules #14923

wants to merge 2 commits into from
+5 −2

Conversation

@ellie-di
Copy link
Contributor

@ellie-di ellie-di commented Oct 24, 2025 •
edited
Loading

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
Copilot AI reviewed Oct 24, 2025
View reviewed changes
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.

christopherco
christopherco reviewed Oct 24, 2025
View reviewed changes
SPECS-SIGNED/mlnx-ofa_kernel-hwe-modules-signed/mlnx-ofa_kernel-hwe-modules-signed.spec
Requires: lsof
Requires: ofed-scripts
Conflicts: mlnx-ofa_kernel
Conflicts: mlnx-ofa_kernel-modules
Copy link
Contributor

@christopherco christopherco Oct 24, 2025 •
edited
Loading

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.

Copy link
Contributor Author

@ellie-di ellie-di Oct 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I see. I went through the OFED packages and double checked that. I've updated those which their spec doesn't match with their signed spec.

@microsoft-github-policy-service microsoft-github-policy-service bot added Packaging 3.0-dev PRs Destined for AzureLinux 3.0 labels Oct 27, 2025
@ellie-di ellie-di force-pushed the edehghani/fix-arm64-mlnx-ofa-kernel branch from 6454b01 to 747bf22 Compare October 27, 2025 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@sidchintamaneni sidchintamaneni Awaiting requested review from sidchintamaneni

@christopherco christopherco Awaiting requested review from christopherco

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

3.0-dev PRs Destined for AzureLinux 3.0 Packaging

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@ellie-di @christopherco