rpms/nvidia-kmod/devel kernel_v3.11.patch, NONE, 1.1 .cvsignore, 1.57, 1.58 nvidia-kmod.spec, 1.131, 1.132 sources, 1.60, 1.61 kernel_v3.10.patch, 1.4, NONE

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21945

Modified Files:
	.cvsignore nvidia-kmod.spec sources 
Added Files:
	kernel_v3.11.patch 
Removed Files:
	kernel_v3.10.patch 
Log Message:
* Tue Aug 06 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:325.15-1
- Update to 325.15 release
- redo kernel patch


kernel_v3.11.patch:
 nv-linux.h |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE kernel_v3.11.patch ---
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -957,7 +957,11 @@ static inline int nv_execute_on_all_cpus
 #endif
 
 #if !defined(NV_VMWARE)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)
+#define NV_NUM_PHYSPAGES                get_num_physpages()
+#else
 #define NV_NUM_PHYSPAGES                num_physpages
+#endif
 #define NV_GET_CURRENT_PROCESS()        current->tgid
 #define NV_IN_ATOMIC()                  in_atomic()
 #define NV_LOCAL_BH_DISABLE()           local_bh_disable()


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/.cvsignore,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- .cvsignore	8 Jul 2013 17:01:29 -0000	1.57
+++ .cvsignore	6 Aug 2013 10:12:44 -0000	1.58
@@ -1 +1 @@
-nvidia-kmod-data-325.08.tar.xz
+nvidia-kmod-data-325.15.tar.xz


Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- nvidia-kmod.spec	21 Jul 2013 08:19:08 -0000	1.131
+++ nvidia-kmod.spec	6 Aug 2013 10:12:44 -0000	1.132
@@ -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 akmod
+%global buildforkernels current
 
 Name:          nvidia-kmod
 Epoch:         1
-Version:       325.08
+Version:       325.15
 # Taken over by kmodtool
-Release:       4%{?dist}
+Release:       1%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -17,19 +17,17 @@
 # Source is created from these files:
 #ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
 #ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
+#ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux-armv7l-gnueabihf-%{version}.run
 
-# <switch me> when sources are on kwizart's repo
-Source0:       http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.xz
-#Source0:       http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{version}.tar.bz2
-# </switch me>
+Source0:        nvidia-kmod-data-%{version}.tar.xz
 
 Source11:       nvidia-kmodtool-excludekernel-filterfile
-Patch0:         kernel_v3.10.patch
+Patch0:         kernel_v3.11.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
-ExclusiveArch:  i686 x86_64
+ExclusiveArch:  i686 x86_64 armv7hl
 
 # get the needed BuildRequires (in parts depending on what we build for)
 BuildRequires:  %{_bindir}/kmodtool
@@ -48,7 +46,7 @@
 %setup -q -c -T -a 0
 
 # patch loop
-for arch in x86 x64
+for arch in x86_64 i686 armv7hl
 do
 pushd nvidiapkg-${arch}
 %patch0 -p1
@@ -57,11 +55,7 @@
 
 
 for kernel_version  in %{?kernel_versions} ; do
-%ifarch %{ix86}
-    cp -a nvidiapkg-x86 _kmod_build_${kernel_version%%___*}
-%else
-    cp -a nvidiapkg-x64 _kmod_build_${kernel_version%%___*}
-%endif
+    cp -a nvidiapkg-%{_target_cpu} _kmod_build_${kernel_version%%___*}
 done
 
 %build
@@ -85,6 +79,10 @@
 
 
 %changelog
+* Tue Aug 06 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:325.15-1
+- Update to 325.15 release
+- redo kernel patch
+
 * Sun Jul 21 2013 Leigh Scott <leigh123linux at googlemail.com> - 1:325.08-4
 - redo kernel patch
 
@@ -99,6 +97,7 @@
 
 * Fri Jun 28 2013 Nicolas Chauvet <kwizart at gmail.com> - 1:319.32-1
 - Update to 319.32
+- Add support for armv7hl
 
 * Fri May 31 2013 leigh scott <leigh123linux at googlemail.com> - 1:319.23-3
 - Patch for 3.10 kernel


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/sources,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sources	8 Jul 2013 17:01:29 -0000	1.60
+++ sources	6 Aug 2013 10:12:44 -0000	1.61
@@ -1 +1 @@
-4439f78a3bdafb69fa189a6038c54765  nvidia-kmod-data-325.08.tar.xz
+c075f748ce929098c317704151ef7fc8  nvidia-kmod-data-325.15.tar.xz


--- kernel_v3.10.patch DELETED ---