rpms/nvidia-beta-kmod/F-9 nvidia-kmodtool-excludekernel-filterfile, NONE, 1.1 nvidia-rawhide-noxen-x64.patch, NONE, 1.1 nvidia-rawhide-noxen-x86.patch, NONE, 1.1 nvidia-beta-kmod.spec, 1.1, 1.2

[NicolasChauvet]

Author: kwizart

Update of /cvs/nonfree/rpms/nvidia-beta-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29745

Modified Files:
	nvidia-beta-kmod.spec 
Added Files:
	nvidia-kmodtool-excludekernel-filterfile 
	nvidia-rawhide-noxen-x64.patch nvidia-rawhide-noxen-x86.patch 
Log Message:
Fix built for F-9



--- NEW FILE nvidia-kmodtool-excludekernel-filterfile ---
xen$

nvidia-rawhide-noxen-x64.patch:

--- NEW FILE nvidia-rawhide-noxen-x64.patch ---
diff -ru usr/src/nv/Makefile.kbuild usr/src/nv/Makefile.kbuild
--- usr/src/nv/Makefile.kbuild	2008-08-08 14:34:33.000000000 -0400
+++ usr/src/nv/Makefile.kbuild	2008-08-08 14:19:03.000000000 -0400
@@ -78,6 +78,15 @@
 EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith -Wno-multichar -Werror -mcmodel=kernel -mno-red-zone -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
 
 #
+# The PARAVIRT symbol was split up and marked GPL only in 2.6.27.
+# This lets us get around that. Only tested with Fedora x86_64.
+#
+
+PV_CPU := $(shell grep "D pv_cpu_ops" /boot/System.map-$(shell uname -r) | colrm 9)
+PV_LOCK := $(shell grep "D pv_lock_ops" /boot/System.map-$(shell uname -r) | colrm 9)
+#EXTRA_LDFLAGS := --defsym pv_cpu_ops=0x$(PV_CPU) --defsym pv_lock_ops=0x$(PV_LOCK)
+
+#
 # We rely on these two definitions below; if they aren't set, we set them to
 # reasonable defaults (Linux 2.4's KBUILD, and top-level passes will not set
 # these).
diff -ru usr/src/nv/conftest.sh usr/src/nv/conftest.sh
--- usr/src/nv/conftest.sh	2008-08-08 14:34:33.000000000 -0400
+++ usr/src/nv/conftest.sh	2008-08-08 14:33:28.000000000 -0400
@@ -1407,6 +1407,12 @@
             fi
         done

+        if [ -n "$IGNORE_XEN_PRESENCE" ]; then
+	    echo "#ifdef CONFIG_XEN" >> conftest.h
+	    echo "#undef CONFIG_XEN" >> conftest.h
+	    echo "#endif"            >> conftest.h
+        fi
+
         if [ -n "$SHOW_COMPILE_TEST_RESULTS" -a -f conftest.h ]; then
             cat conftest.h
         fi

nvidia-rawhide-noxen-x86.patch:

--- NEW FILE nvidia-rawhide-noxen-x86.patch ---
diff -ru usr/src/nv/Makefile.kbuild usr/src/nv/Makefile.kbuild
--- usr/src/nv/Makefile.kbuild	2008-08-08 14:34:33.000000000 -0400
+++ usr/src/nv/Makefile.kbuild	2008-08-08 14:19:03.000000000 -0400
@@ -78,6 +78,15 @@
 EXTRA_CFLAGS += -Wall -Wimplicit -Wreturn-type -Wswitch -Wformat -Wchar-subscripts -Wparentheses -Wpointer-arith -Wno-multichar -Werror -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual -Wno-error
 
 #
+# The PARAVIRT symbol was split up and marked GPL only in 2.6.27.
+# This lets us get around that. Only tested with Fedora x86_64.
+#
+
+PV_CPU := $(shell grep "D pv_cpu_ops" /boot/System.map-$(shell uname -r) | colrm 9)
+PV_LOCK := $(shell grep "D pv_lock_ops" /boot/System.map-$(shell uname -r) | colrm 9)
+#EXTRA_LDFLAGS := --defsym pv_cpu_ops=0x$(PV_CPU) --defsym pv_lock_ops=0x$(PV_LOCK)
+
+#
 # We rely on these two definitions below; if they aren't set, we set them to
 # reasonable defaults (Linux 2.4's KBUILD, and top-level passes will not set
 # these).
diff -ru usr/src/nv/conftest.sh usr/src/nv/conftest.sh
--- usr/src/nv/conftest.sh	2008-08-08 14:34:33.000000000 -0400
+++ usr/src/nv/conftest.sh	2008-08-08 14:33:28.000000000 -0400
@@ -1407,6 +1407,12 @@
             fi
         done

+        if [ -n "$IGNORE_XEN_PRESENCE" ]; then
+	    echo "#ifdef CONFIG_XEN" >> conftest.h
+	    echo "#undef CONFIG_XEN" >> conftest.h
+	    echo "#endif"            >> conftest.h
+        fi
+
         if [ -n "$SHOW_COMPILE_TEST_RESULTS" -a -f conftest.h ]; then
             cat conftest.h
         fi


Index: nvidia-beta-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-beta-kmod/F-9/nvidia-beta-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-beta-kmod.spec	13 Nov 2008 10:25:42 -0000	1.1
+++ nvidia-beta-kmod.spec	13 Nov 2008 19:56:56 -0000	1.2
@@ -8,7 +8,7 @@
 Name:          nvidia-beta-kmod
 Version:       177.61.02
 # Taken over by kmodtool
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -22,6 +22,9 @@
 #Source0:       http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{version}.tar.bz2
 # </switch me>
 
+Source11:      nvidia-kmodtool-excludekernel-filterfile
+Patch0:        nvidia-rawhide-noxen-x64.patch
+Patch1:        nvidia-rawhide-noxen-x86.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # needed for plague to make sure it builds for i586 and i686
@@ -31,7 +34,7 @@
 BuildRequires:  %{_bindir}/kmodtool
 %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
 # kmodtool does its magic here
-%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
 
 
 %description
@@ -41,7 +44,7 @@
 # error out if there was something wrong with kmodtool
 %{?kmodtool_check}
 # print kmodtool output for debugging purposes:
-kmodtool  --target %{_target_cpu}  --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+kmodtool  --target %{_target_cpu}  --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
 %setup -q -c -T -a 0
 
 # patch loop
@@ -52,6 +55,11 @@
 #    popd
 #done
 
+pushd nvidiapkg-x64
+%patch0 -b .noxen
+popd;pushd nvidiapkg-x86
+%patch1 -b .noxen
+popd
 
 for kernel_version  in %{?kernel_versions} ; do
 %ifarch %{ix86}
@@ -92,6 +100,9 @@
 
 
 %changelog
+* Thu Nov 13 2008 kwizart < kwizart at gmail.com > - 177.61.02-2
+- Fix built for F-9
+
 * Thu Oct 30 2008 kwizart < kwizart at gmail.com > - 177.61.02-1
 - Rename to nvidia-beta 
 - Update to 177.61.02 (beta with opengl 3.0 support).