Skip to content

Commit

Permalink
Merge pull request bottlerocket-os#4015 from yeazelm/fm_rpm
Browse files Browse the repository at this point in the history 
kmod-*-nvidia: switch source for Fabric Manager binaries
  • Loading branch information
@yeazelm
yeazelm authored May 31, 2024
2 parents 948401d + 12774ea commit b3e476f
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 24 deletions.
8 changes: 4 additions & 4 deletions packages/kmod-5.15-nvidia/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ sha512 = "bb96a28b45197003480ae223c71a5426ef5258a31eaa485cab0cf4b86bed1664827347
force-upstream = true

[[package.metadata.build-package.external-files]]
url = "https://developer.download.nvidia.com/compute/nvidia-driver/redist/fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-535.161.07-archive.tar.xz"
sha512 = "868b35d567e4c6dccbff0f7e8f74bc55781c8d71db995fd9e471829afec0b44fd430caba964377052678e244d18ea999133487f9a3c50c7289f381480b24c55d"
url = "https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/nvidia-fabric-manager-535.161.07-1.x86_64.rpm"
sha512 = "6710c40b0e50f974697d2c7078281cd2d28a685c138c20cfe9da4696431a5aceb56f04a30e29f4fe05f2b5eddccb7e456897053051ad91d89d40383629525245"
force-upstream = true

[[package.metadata.build-package.external-files]]
url = "https://developer.download.nvidia.com/compute/nvidia-driver/redist/fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-535.161.07-archive.tar.xz"
sha512 = "f37f7a24e31dd6ed184d1041616abb8cfcb0ddaec79778930db79bbef8b23b3d468daaa9c156a6cf7a7f2ffc0507e78e2bb6215f70bc39d11bb0ee16c5ef4c82"
url = "https://developer.download.nvidia.com/compute/cuda/repos/rhel9/sbsa/nvidia-fabric-manager-535.161.07-1.aarch64.rpm"
sha512 = "3ac673b6f38fd5fbdca021fbc910b6ec6a506dd34ec814ee0003da59de600d044b11c5a97f087080c8581910db33aef71bace5ddb601ee39474d7fde3deeeaa2"
force-upstream = true

[build-dependencies]
Expand Down
17 changes: 9 additions & 8 deletions packages/kmod-5.15-nvidia/kmod-5.15-nvidia.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Source1: https://us.download.nvidia.com/tesla/%{tesla_ver}/NVIDIA-Linux-aarch64-
Source2: NVidiaEULAforAWS.pdf

# fabricmanager for NVSwitch
Source10: https://developer.download.nvidia.com/compute/nvidia-driver/redist/fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-%{tesla_ver}-archive.tar.xz
Source11: https://developer.download.nvidia.com/compute/nvidia-driver/redist/fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-%{tesla_ver}-archive.tar.xz
Source10: https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/nvidia-fabric-manager-%{tesla_ver}-1.x86_64.rpm
Source11: https://developer.download.nvidia.com/compute/cuda/repos/rhel9/sbsa/nvidia-fabric-manager-%{tesla_ver}-1.aarch64.rpm

# Common NVIDIA conf files from 200 to 299
Source200: nvidia-tmpfiles.conf.in
Expand Down Expand Up @@ -76,9 +76,10 @@ Provides: %{name}-tesla(fabricmanager)
# the driver in the current run
sh %{_sourcedir}/NVIDIA-Linux-%{_cross_arch}-%{tesla_ver}.run -x

# Extract fabricmanager archive. Use `tar` rather than `%%setup` since the
# Extract fabricmanager from the rpm via cpio rather than `%%setup` since the
# correct source is architecture-dependent.
tar -xf %{_sourcedir}/fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive.tar.xz
mkdir fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive
rpm2cpio %{_sourcedir}/nvidia-fabric-manager-%{tesla_ver}-1.%{_cross_arch}.rpm | cpio -idmV -D fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive

# Add the license.
install -p -m 0644 %{S:2} .
Expand Down Expand Up @@ -213,11 +214,11 @@ popd

# Begin NVIDIA fabric manager binaries and topologies
pushd fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive
install -p -m 0755 bin/nv-fabricmanager %{buildroot}%{_cross_libexecdir}/nvidia/tesla/bin
install -p -m 0755 bin/nvswitch-audit %{buildroot}%{_cross_libexecdir}/nvidia/tesla/bin
install -p -m 0755 usr/bin/nv-fabricmanager %{buildroot}%{_cross_libexecdir}/nvidia/tesla/bin
install -p -m 0755 usr/bin/nvswitch-audit %{buildroot}%{_cross_libexecdir}/nvidia/tesla/bin

install -d %{buildroot}%{_cross_datadir}/nvidia/tesla/nvswitch
for t in share/nvidia/nvswitch/*_topology ; do
for t in usr/share/nvidia/nvswitch/*_topology ; do
install -p -m 0644 "${t}" %{buildroot}%{_cross_datadir}/nvidia/tesla/nvswitch
done

Expand All @@ -236,7 +237,7 @@ popd

%files tesla-%{tesla_major}
%license NVidiaEULAforAWS.pdf
%license fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive/third-party-notices.txt
%license fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive/usr/share/doc/nvidia-fabricmanager/third-party-notices.txt
%dir %{_cross_datadir}/nvidia/tesla
%dir %{_cross_libexecdir}/nvidia/tesla/bin
%dir %{_cross_libdir}/nvidia/tesla
Expand Down
8 changes: 4 additions & 4 deletions packages/kmod-6.1-nvidia/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ sha512 = "bb96a28b45197003480ae223c71a5426ef5258a31eaa485cab0cf4b86bed1664827347
force-upstream = true

[[package.metadata.build-package.external-files]]
url = "https://developer.download.nvidia.com/compute/nvidia-driver/redist/fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-535.161.07-archive.tar.xz"
sha512 = "868b35d567e4c6dccbff0f7e8f74bc55781c8d71db995fd9e471829afec0b44fd430caba964377052678e244d18ea999133487f9a3c50c7289f381480b24c55d"
url = "https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/nvidia-fabric-manager-535.161.07-1.x86_64.rpm"
sha512 = "6710c40b0e50f974697d2c7078281cd2d28a685c138c20cfe9da4696431a5aceb56f04a30e29f4fe05f2b5eddccb7e456897053051ad91d89d40383629525245"
force-upstream = true

[[package.metadata.build-package.external-files]]
url = "https://developer.download.nvidia.com/compute/nvidia-driver/redist/fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-535.161.07-archive.tar.xz"
sha512 = "f37f7a24e31dd6ed184d1041616abb8cfcb0ddaec79778930db79bbef8b23b3d468daaa9c156a6cf7a7f2ffc0507e78e2bb6215f70bc39d11bb0ee16c5ef4c82"
url = "https://developer.download.nvidia.com/compute/cuda/repos/rhel9/sbsa/nvidia-fabric-manager-535.161.07-1.aarch64.rpm"
sha512 = "3ac673b6f38fd5fbdca021fbc910b6ec6a506dd34ec814ee0003da59de600d044b11c5a97f087080c8581910db33aef71bace5ddb601ee39474d7fde3deeeaa2"
force-upstream = true

[build-dependencies]
Expand Down
17 changes: 9 additions & 8 deletions packages/kmod-6.1-nvidia/kmod-6.1-nvidia.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Source1: https://us.download.nvidia.com/tesla/%{tesla_ver}/NVIDIA-Linux-aarch64-
Source2: NVidiaEULAforAWS.pdf

# fabricmanager for NVSwitch
Source10: https://developer.download.nvidia.com/compute/nvidia-driver/redist/fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-%{tesla_ver}-archive.tar.xz
Source11: https://developer.download.nvidia.com/compute/nvidia-driver/redist/fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-%{tesla_ver}-archive.tar.xz
Source10: https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/nvidia-fabric-manager-%{tesla_ver}-1.x86_64.rpm
Source11: https://developer.download.nvidia.com/compute/cuda/repos/rhel9/sbsa/nvidia-fabric-manager-%{tesla_ver}-1.aarch64.rpm

# Common NVIDIA conf files from 200 to 299
Source200: nvidia-tmpfiles.conf.in
Expand Down Expand Up @@ -76,9 +76,10 @@ Provides: %{name}-tesla(fabricmanager)
# the driver in the current run
sh %{_sourcedir}/NVIDIA-Linux-%{_cross_arch}-%{tesla_ver}.run -x

# Extract fabricmanager archive. Use `tar` rather than `%%setup` since the
# Extract fabricmanager from the rpm via cpio rather than `%%setup` since the
# correct source is architecture-dependent.
tar -xf %{_sourcedir}/fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive.tar.xz
mkdir fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive
rpm2cpio %{_sourcedir}/nvidia-fabric-manager-%{tesla_ver}-1.%{_cross_arch}.rpm | cpio -idmV -D fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive

# Add the license.
install -p -m 0644 %{S:2} .
Expand Down Expand Up @@ -213,11 +214,11 @@ popd

# Begin NVIDIA fabric manager binaries and topologies
pushd fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive
install -p -m 0755 bin/nv-fabricmanager %{buildroot}%{_cross_libexecdir}/nvidia/tesla/bin
install -p -m 0755 bin/nvswitch-audit %{buildroot}%{_cross_libexecdir}/nvidia/tesla/bin
install -p -m 0755 usr/bin/nv-fabricmanager %{buildroot}%{_cross_libexecdir}/nvidia/tesla/bin
install -p -m 0755 usr/bin/nvswitch-audit %{buildroot}%{_cross_libexecdir}/nvidia/tesla/bin

install -d %{buildroot}%{_cross_datadir}/nvidia/tesla/nvswitch
for t in share/nvidia/nvswitch/*_topology ; do
for t in usr/share/nvidia/nvswitch/*_topology ; do
install -p -m 0644 "${t}" %{buildroot}%{_cross_datadir}/nvidia/tesla/nvswitch
done

Expand All @@ -236,7 +237,7 @@ popd

%files tesla-%{tesla_major}
%license NVidiaEULAforAWS.pdf
%license fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive/third-party-notices.txt
%license fabricmanager-linux-%{fm_arch}-%{tesla_ver}-archive/usr/share/doc/nvidia-fabricmanager/third-party-notices.txt
%dir %{_cross_datadir}/nvidia/tesla
%dir %{_cross_libexecdir}/nvidia/tesla/bin
%dir %{_cross_libdir}/nvidia/tesla
Expand Down

0 comments on commit b3e476f

Please sign in to comment.