diff --git a/kmod-nvidia-open.spec.preamble b/kmod-nvidia-open.spec.preamble index ad5341f..afe1f7e 100644 --- a/kmod-nvidia-open.spec.preamble +++ b/kmod-nvidia-open.spec.preamble @@ -6,6 +6,5 @@ Conflicts: nvidia-kmod Provides: nvidia-kmod = 3:%{version} # Require our parts of the stack Requires: nvidia-open-kmod = %{version}-%{release} -Requires: nvidia-gsprm-gpu-firmware = %{version} # Use negativo17 packaged userspace libraries Supplements: (kernel%{?1:-%1} and nvidia-driver-libs%{?_isa}) diff --git a/nvidia-gsprm-gpu-firmware.spec b/nvidia-gsprm-gpu-firmware.spec deleted file mode 100644 index 17d5ea4..0000000 --- a/nvidia-gsprm-gpu-firmware.spec +++ /dev/null @@ -1,44 +0,0 @@ -# Backport missing architecture macros -%{!?x86_64: %global x86_64 x86_64 amd64 em64t} -%{!?arm64: %global arm64 aarch64} - -Name: nvidia-gsprm-gpu-firmware -Version: 570.133.07 -Release: 0%{?dist}.1 -Summary: NVIDIA GSP-RM GPU firmware - -License: LicenseRef-NVIDIA -URL: https://nvidia.com -Source0: https://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run - -ExclusiveArch: %{x86_64} %{arm64} noarch -BuildArch: noarch - -%description -This package provides the NVIDIA GSP-RM GPU firmware -for the NVIDIA GPU driver for Turing and newer GPUs. - -%prep -%setup -qcT -sh %{SOURCE0} --extract-only - - -%build -# Nothing to do - - -%install -# Install gpu-open firmware and license files -mkdir -p %{buildroot}%{_prefix}/lib/firmware/nvidia/%{version} -cp -a NVIDIA-Linux-x86_64-%{version}/firmware/* %{buildroot}%{_prefix}/lib/firmware/nvidia/%{version} - - -%files -%license NVIDIA-Linux-x86_64-%{version}/LICENSE -%dir %{_prefix}/lib/firmware/nvidia -%{_prefix}/lib/firmware/nvidia/%{version}/ - - -%changelog -* Mon Apr 07 2025 Neal Gompa - 570.133.07-0.1 -- Initial package diff --git a/nvidia-open-kmod.spec b/nvidia-open-kmod.spec index 654ce9d..63c9520 100644 --- a/nvidia-open-kmod.spec +++ b/nvidia-open-kmod.spec @@ -44,8 +44,8 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: make -# Depend on negativo17 userspace libraries -Requires: nvidia-driver-libs%{?_isa} = 3:%{version} +# Depend on negativo17 kmod support packaging +Requires: nvidia-kmod-common = 3:%{version} # Only supported architectures for the driver ExclusiveArch: %{x86_64} %{arm64}