Author: firewing
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23231
Modified Files:
nvidia-kmod.spec nvidia-rawhide-noxen-x64.patch
nvidia-rawhide-noxen-x86.patch
Log Message:
Remove EXTRA_LDFLAGS
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-kmod.spec 5 Oct 2008 11:55:49 -0000 1.1
+++ nvidia-kmod.spec 5 Oct 2008 18:06:24 -0000 1.2
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Version: 177.78
# Taken over by kmodtool
-Release: 2%{?dist}.1
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -99,7 +99,10 @@
%changelog
-* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 177.78-2.1
+* Sun Oct 5 2008 Stewart Adam <s.adam at diffingo.com> - 177.78-3
+- Disable EXTRA_LDFLAGS in patches
+
+* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.78-2.1
- rebuild for rpm fusion
* Wed Oct 1 2008 Stewart Adam < s.adam at
diffingo.com > - 177.78-1
nvidia-rawhide-noxen-x64.patch:
Index: nvidia-rawhide-noxen-x64.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-rawhide-noxen-x64.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-rawhide-noxen-x64.patch 5 Oct 2008 11:55:49 -0000 1.1
+++ nvidia-rawhide-noxen-x64.patch 5 Oct 2008 18:06:24 -0000 1.2
@@ -11,7 +11,7 @@
+
+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)
++#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
nvidia-rawhide-noxen-x86.patch:
Index: nvidia-rawhide-noxen-x86.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-rawhide-noxen-x86.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nvidia-rawhide-noxen-x86.patch 5 Oct 2008 11:55:49 -0000 1.1
+++ nvidia-rawhide-noxen-x86.patch 5 Oct 2008 18:06:24 -0000 1.2
@@ -11,7 +11,7 @@
+
+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)
++#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