From e5b90118b16c44282fc710b8dc9b72f7d6ef47aa Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:46:49 +0100 Subject: [PATCH] dkms: replace obsoleted SUBDIRS= with M= [release 340.108-2mamba;Fri Jul 24 2020] --- nvidia_340.spec | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/nvidia_340.spec b/nvidia_340.spec index b6c6269..e8f1dfb 100644 --- a/nvidia_340.spec +++ b/nvidia_340.spec @@ -1,17 +1,16 @@ -%define nvidia_current_ver %version %define nvidia_current_libver %version Name: nvidia_340 -Version: 340.107 +Version: 340.108 Epoch: 1 -Release: 1mamba +Release: 2mamba Summary: NVIDIA proprietary accelerated drivers for the Linux Kernel Group: System/Kernel and Hardware Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://www.nvidia.com/object/unix.html -Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{nvidia_current_ver}/NVIDIA-Linux-x86-%{nvidia_current_ver}.run -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{nvidia_current_ver}/NVIDIA-Linux-x86_64-%{nvidia_current_ver}.run +Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run +Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run Patch0: nvidia-331.20-x86-conftest.patch Patch1: nvidia-340.102-kernel-4.9.patch Patch2: nvidia_340-340.102-kernel-4.9-2.patch @@ -112,10 +111,10 @@ This package contains the HTML documentation. # %if "%{_target_cpu}" == "x86_64" sh %{SOURCE1} --extract-only - ln -sf NVIDIA-Linux-x86_64-%{nvidia_current_ver} current + ln -sf NVIDIA-Linux-x86_64-%{version} current %else sh %{SOURCE0} --extract-only - ln -sf NVIDIA-Linux-x86-%{nvidia_current_ver} current + ln -sf NVIDIA-Linux-x86-%{version} current %endif sed -i "s|__UTILS_PATH__|%{_bindir}|;s|__PIXMAP_PATH__|%{_datadir}/pixmaps|" \ @@ -141,8 +140,8 @@ cat > %{buildroot}%{_prefix}/src/%{name}-%{version}/dkms.conf << _EOF PACKAGE_NAME=%{name} PACKAGE_VERSION=%{version} MAKE="ln -sf /usr/src/\${PACKAGE_NAME}-\${PACKAGE_VERSION}/nv-kernel.o \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build/;\ -make -C \${kernel_source_dir} KERNEL_SOURCES=\${kernel_source_dir} SUBDIRS=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build modules" -CLEAN="make -C \${kernel_source_dir} SUBDIRS=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean" +make -C \${kernel_source_dir} KERNEL_SOURCES=\${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build modules" +CLEAN="make -C \${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean" BUILT_MODULE_NAME=nvidia BUILT_MODULE_LOCATION=./ DEST_MODULE_LOCATION=/kernel/drivers/video @@ -439,6 +438,12 @@ exit 0 %doc current/{LICENSE,NVIDIA_Changelog,README.txt} current/html %changelog +* Fri Jul 24 2020 Silvan Calarco 340.108-2mamba +- dkms: replace obsoleted SUBDIRS= with M= + +* Thu Jul 23 2020 Silvan Calarco 340.108-1mamba +- update to 340.108 + * Thu Feb 28 2019 Silvan Calarco 340.107-1mamba - update to 340.107 @@ -786,7 +791,7 @@ exit 0 * Thu Apr 26 2007 Silvan Calarco 2.6.21-1mamba - rebuild with kernel 2.6.21 -* Mon Mar 13 2007 Silvan Calarco 2.6.20-2qilnx +* Tue Mar 13 2007 Silvan Calarco 2.6.20-2qilnx - driver update to 9755 - obsolete old kernel's package @@ -794,7 +799,7 @@ exit 0 - update to version 2.6.20 by autospec - nvidia driver update to 9746 -* Wed Dec 28 2006 Silvan Calarco 2.6.19-2qilnx +* Thu Dec 28 2006 Silvan Calarco 2.6.19-2qilnx - rename libglx-nvidia to xorg-ext-libglx-nvidia and obsolete libglx-nvidia * Thu Dec 21 2006 Silvan Calarco 2.6.19-1qilnx @@ -824,7 +829,7 @@ exit 0 * Sun Apr 16 2006 Silvan Calarco 2.6.16-2qilnx - update to version 1.0-8756 -* Sat Apr 02 2006 Silvan Calarco 2.6.16-1qilnx +* Sun Apr 02 2006 Silvan Calarco 2.6.16-1qilnx - new kernel version build * Thu Mar 30 2006 Silvan Calarco 2.6.15-11qilnx