Skip to content

Add msr-tools package from upstream#17149

Open
MadhurAggarwal wants to merge 3 commits into
tomls/base/mainfrom
madagg/tomls/base/main/add-msr-tools-package
Open

Add msr-tools package from upstream#17149
MadhurAggarwal wants to merge 3 commits into
tomls/base/mainfrom
madagg/tomls/base/main/add-msr-tools-package

Conversation

@MadhurAggarwal
Copy link
Copy Markdown
Member

@MadhurAggarwal MadhurAggarwal commented May 12, 2026

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?

  • Adds msr-tools package from upstream fedora sources
  • Ensured that it provides the required: rdmsr / wrmsr
  • This was required for fixing LISA P1 Test: verify_hyperv_platform_id which skips due to this missing package
Change Log
  • Added msr-tools package from upstream Fedora sources
Does this affect the toolchain?

NO

Associated issues

WorkItem: https://dev.azure.com/mariner-org/mariner/_workitems/edit/18998/

Test Methodology

Local RPM Build:
image

@MadhurAggarwal MadhurAggarwal changed the title Madagg/tomls/base/main/add msr tools package Add msr-tools package from upstream May 12, 2026
[components.msr-tools]

[[components.msr-tools.overlays]]
description = "Normalize Fedora's Release tag to the optional (?) dist macro form so azldev can auto-bump it"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Interesting find that the upstream spec uses %{dist} and not %{?dist}!

A few thoughts:

  • We should update azldev (https://github.com/microsoft/azure-linux-dev-tools) to handle this case so this overlay isn't required.
  • Explicitly setting 30%{?dist} may clobber whatever base Release value we get from the upstream spec when we rebase against a later set of commits from upstream.

I'd actually recommend getting the change into azldev -- it's simple enough we can expedite it through.

Copy link
Copy Markdown
Member Author

@MadhurAggarwal MadhurAggarwal May 12, 2026

Choose a reason for hiding this comment

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

The non-conditional %{dist} autobump was specifically rejected in this test: https://github.com/microsoft/azure-linux-dev-tools/blob/979370c7b7e32f06ceed2c0adbc797e8a88ae731/internal/app/azldev/core/sources/release_test.go#L74
is there any particular reason for this?

I have for now raised this draft PR to allow autobump for these: microsoft/azure-linux-dev-tools#179
(one-line regex change and some tests)
Can you confirm if this update to azldev is correct? I'll update this msr-tools package tomls accordingly.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Good question -- I think that was an oversight. Your draft PR looks good to me. I'm happy to approve and merge it once you take it out of draft and it passes PR checks.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I've opened the PR and all PR checks have passed. Can you please review it?

@reubeno
Copy link
Copy Markdown
Member

reubeno commented May 12, 2026

@MadhurAggarwal -- I've merged your PR to azldev; can you try updating this PR?

@MadhurAggarwal MadhurAggarwal force-pushed the madagg/tomls/base/main/add-msr-tools-package branch from 2f7207f to cd55e9f Compare May 12, 2026 15:22
@MadhurAggarwal
Copy link
Copy Markdown
Member Author

MadhurAggarwal commented May 12, 2026

@MadhurAggarwal -- I've merged your PR to azldev; can you try updating this PR?

Thanks!
I've updated this PR to use the latest azldev build.
Attached local rpm build logs for msr-tool

@MadhurAggarwal MadhurAggarwal marked this pull request as ready for review May 12, 2026 15:29
Copilot AI review requested due to automatic review settings May 12, 2026 15:29
Copy link
Copy Markdown
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

Adds the Fedora-imported msr-tools component/spec to the Azure Linux repo so the rdmsr / wrmsr utilities are available as a packaged dependency (e.g., for LISA validation scenarios).

Changes:

  • Added the msr-tools component to the Fedora-import list (components.toml) and introduced its lockfile.
  • Added rendered spec artifacts for msr-tools (spec, sources hash, and the upstream patch used by the spec).

Reviewed changes

Copilot reviewed 4 out of 5 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
specs/m/msr-tools/sources Adds the source tarball hash entry for the rendered component.
specs/m/msr-tools/msr-tools.spec Introduces the rendered RPM spec for building/packaging msr-tools.
specs/m/msr-tools/bz1268604-increase-max-procs.patch Adds the patch referenced by the spec to increase supported CPU index range.
locks/msr-tools.lock Adds the azldev-managed lock pinning the imported upstream commit and input fingerprint.
base/comps/components.toml Registers msr-tools as an unmodified Fedora-imported component (needs ordering fix per stored comment).

Comment thread base/comps/components.toml
Copy link
Copy Markdown
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.

Did you confirm that this builds in our build services?

Comment thread base/comps/components.toml
@MadhurAggarwal MadhurAggarwal force-pushed the madagg/tomls/base/main/add-msr-tools-package branch from e044c04 to 8915631 Compare May 13, 2026 06:06
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.

3 participants