rpms/nvidia-kmod/F-19 nv-linux-arm.patch, NONE, 1.1 nvidia-kmod.spec, 1.157, 1.158

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12364/F-19

Modified Files:
	nvidia-kmod.spec 
Added Files:
	nv-linux-arm.patch 
Log Message:
Fix build with lpae kernel


nv-linux-arm.patch:
 nv-linux.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE nv-linux-arm.patch ---
diff -up nvidiapkg-armv7hl/kernel/nv-linux.h.arm nvidiapkg-armv7hl/kernel/nv-linux.h
--- nvidiapkg-armv7hl/kernel/nv-linux.h.arm	2013-10-30 20:03:30.000000000 -0400
+++ nvidiapkg-armv7hl/kernel/nv-linux.h	2013-12-15 06:57:24.857474273 -0500
@@ -218,7 +218,8 @@ RM_STATUS nvos_forward_error_to_cray(str
  * NVIDIA graphics driver has no way of knowing and is unlikely
  * to work correctly.
  */
-#if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT)
+#if defined(CONFIG_XEN) && !defined(CONFIG_PARAVIRT) && \
+    !defined(NVCPU_ARM)
 #include <asm/maddr.h>
 #include <xen/interface/memory.h>
 #define NV_XEN_SUPPORT_OLD_STYLE_KERNEL


Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- nvidia-kmod.spec	11 Dec 2013 23:28:27 -0000	1.157
+++ nvidia-kmod.spec	15 Dec 2013 12:44:06 -0000	1.158
@@ -3,13 +3,13 @@
 # "buildforkernels newest" macro for just that build; immediately after
 # queuing that build enable the macro again for subsequent builds; that way
 # a new akmod package will only get build when a new one is actually needed
-#global buildforkernels newest
+%global buildforkernels current
 
 Name:          nvidia-kmod
 Epoch:         1
 Version:       331.20
 # Taken over by kmodtool
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -24,6 +24,7 @@
 #tar -cJf nvidia-kmod-data-%{version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel
 
 Source0:        nvidia-kmod-data-%{version}.tar.xz
+Patch0:         nv-linux-arm.patch
 
 Source11:       nvidia-kmodtool-excludekernel-filterfile
 
@@ -50,11 +51,12 @@
 
 # patch loop
 #for arch in x86_64 i686 armv7hl
-#do
-#pushd nvidiapkg-${arch}
-#patch0 -p1
-#popd
-#done
+for arch in armv7hl
+do
+pushd nvidiapkg-${arch}
+%patch0 -p1
+popd
+done
 
 
 for kernel_version  in %{?kernel_versions} ; do
@@ -94,11 +96,23 @@
 
 
 %changelog
+* Sun Dec 15 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:331.20-10
+- Fix build with lpae kernel
+
 * Wed Dec 11 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:331.20-9
 - Resort and IGNORE XEN/RT Checks
 
-* Tue Dec 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:331.20-3.1
-- Rebuilt for kernel
+* Tue Dec 10 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:331.20-8
+- Rebuilt for f20 final kernel
+
+* Sat Dec 07 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:331.20-7
+- Rebuilt for f20 final kernel
+
+* Sun Dec 01 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:331.20-6
+- Rebuilt for f20 final kernel
+
+* Sun Nov 24 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:331.20-5
+- Bump
 
 * Sun Nov 24 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:331.20-3
 - Allow akmod to build modules for cuda