Skip to content

Use cross_nvidia_paths macro - #594

Open
jpculp wants to merge 6 commits into
bottlerocket-os:developfrom
jpculp:use-cross-nvidia-paths-macro
Open

jpculp wants to merge 6 commits into
bottlerocket-os:developfrom
jpculp:use-cross-nvidia-paths-macro

Conversation

@jpculp

@jpculp jpculp commented Oct 15, 2026

Copy link
Copy Markdown
Member

Description of changes:

Switch to a parametrized macro, shared by the nvidia kmod packages in the Bottlerocket SDK (bottlerocket-os/bottlerocket-sdk#394), that defines the branch-namespaced NVIDIA path macros for a given driver branch. It takes the branch as %1, resolves nvidia_root to %{_cross_datadir}/.nvidia/<branch>, and derives the per-branch datadir/libdir/bindir/sysconfdir globals from it. Collapses an otherwise duplicated path-definition block down to a single %cross_nvidia_paths <branch> call.

Testing done:

Compared /usr/share/nvidia/ contents of the latest AMI and one built using the new macro.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

@jpculp

jpculp commented Oct 19, 2026

Copy link
Copy Markdown
Member Author

Depends on #596.

@jpculp
jpculp marked this pull request as ready for review October 19, 2026 22:50
Signed-off-by: Patrick J.P. Culp <jpculp@amazon.com>
Signed-off-by: Patrick J.P. Culp <jpculp@amazon.com>
Signed-off-by: Patrick J.P. Culp <jpculp@amazon.com>
Signed-off-by: Patrick J.P. Culp <jpculp@amazon.com>
Signed-off-by: Patrick J.P. Culp <jpculp@amazon.com>
Signed-off-by: Patrick J.P. Culp <jpculp@amazon.com>
@jpculp
jpculp force-pushed the use-cross-nvidia-paths-macro branch from 7f2adba to d90cb1e Compare October 19, 2026 23:05
@jpculp

jpculp commented Oct 19, 2026

Copy link
Copy Markdown
Member Author

Re-based for clean checks.

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