Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-kmod/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22729 Modified Files: nv-linux-arm.patch nv-linux-arm2.patch nvidia-kmod.spec Log Message: * Mon Aug 31 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:355.11-1 - Update to 355.11 nv-linux-arm.patch: nv-linux.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: nv-linux-arm.patch =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nv-linux-arm.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nv-linux-arm.patch 17 Jan 2015 00:27:32 -0000 1.5 +++ nv-linux-arm.patch 2 Sep 2015 23:21:39 -0000 1.6 @@ -1,6 +1,6 @@ -diff -up nvidiapkg-armv7hl/kernel/nv-linux.h.arm nvidiapkg-armv7hl/kernel/nv-linux.h ---- nvidiapkg-armv7hl/kernel/nv-linux.h.arm 2015-01-11 04:30:46.000000000 +0000 -+++ nvidiapkg-armv7hl/kernel/nv-linux.h 2015-01-16 23:20:16.785229307 +0000 +diff -up nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.arm nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h +--- nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.arm 2015-01-11 04:30:46.000000000 +0000 ++++ nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h 2015-01-16 23:20:16.785229307 +0000 @@ -240,7 +240,8 @@ NV_STATUS nvos_forward_error_to_cray(str * NVIDIA graphics driver has no way of knowing and is unlikely * to work correctly. nv-linux-arm2.patch: nv-linux.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: nv-linux-arm2.patch =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nv-linux-arm2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nv-linux-arm2.patch 29 Jul 2015 12:20:21 -0000 1.1 +++ nv-linux-arm2.patch 2 Sep 2015 23:21:39 -0000 1.2 @@ -1,6 +1,6 @@ -diff -up nvidiapkg-armv7hl/kernel/nv-linux.h.swf nvidiapkg-armv7hl/kernel/nv-linux.h ---- nvidiapkg-armv7hl/kernel/nv-linux.h.swf 2015-07-22 02:40:54.000000000 +0200 -+++ nvidiapkg-armv7hl/kernel/nv-linux.h 2015-07-29 14:07:14.866367595 +0200 +diff -up nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.swf nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h +--- nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.swf 2015-07-22 02:40:54.000000000 +0200 ++++ nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h 2015-07-29 14:07:14.866367595 +0200 @@ -148,7 +148,7 @@ static inline uid_t __kuid_val(kuid_t ui #include <linux/dma-mapping.h> #endif Index: nvidia-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- nvidia-kmod.spec 28 Aug 2015 21:20:45 -0000 1.221 +++ nvidia-kmod.spec 2 Sep 2015 23:21:39 -0000 1.222 @@ -7,7 +7,7 @@ Name: nvidia-kmod Epoch: 1 -Version: 352.41 +Version: 355.11 # Taken over by kmodtool Release: 1%{?dist} Summary: NVIDIA display driver kernel module @@ -57,19 +57,8 @@ make %{?_smp_mflags} \ KERNEL_UNAME="${kernel_version%%___*}" SYSSRC="${kernel_version##*___}" \ IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \ - %{?_nv_build_module_instances:NV_BUILD_MODULE_INSTANCES=%{?_nv_build_module_instances}} \ module popd -%{!?_nv_build_module_instances: -%ifarch x86_64 - pushd _kmod_build_${kernel_version%%___*}/uvm - make %{?_smp_mflags} \ - KERNEL_UNAME="${kernel_version%%___*}" SYSSRC="${kernel_version##*___}" \ - IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \ - module - popd -%endif -} done @@ -77,11 +66,7 @@ rm -rf $RPM_BUILD_ROOT for kernel_version in %{?kernel_versions}; do mkdir -p $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ -%ifarch x86_64 - install -D -m 0755 _kmod_build_${kernel_version%%___*}/{,uvm}/nvidia*.ko \ -%else - install -D -m 0755 _kmod_build_${kernel_version%%___*}/nvidia.ko \ -%endif + install -D -m 0755 _kmod_build_${kernel_version%%___*}/nvidia*.ko \ $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ done %{?akmod_install} @@ -92,6 +77,9 @@ %changelog +* Mon Aug 31 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:355.11-1 +- Update to 355.11 + * Fri Aug 28 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:352.41-1 - Update to 352.41