Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/F-17
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7425
Modified Files:
nvidia-kmod.spec
Added Files:
kernel-3.3.patch
Log Message:
* Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.20-2
- patched to build with 3.3.0 kernel
kernel-3.3.patch:
conftest.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kernel-3.3.patch ---
--- a/kernel/conftest.sh
+++ b/kernel/conftest.sh
@@ -126,7 +126,7 @@
CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS
$AUTOCONF_CFLAGS"
if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64"
]; then
- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include"
+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include
-I$SOURCES/arch/x86/include/generated"
elif [ "$ARCH" = "ARMv7" ]; then
CFLAGS="$CFLAGS -I$SOURCES/arch/arm/include"
fi
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-17/nvidia-kmod.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- nvidia-kmod.spec 27 Feb 2012 22:19:38 -0000 1.96
+++ nvidia-kmod.spec 22 Mar 2012 14:37:58 -0000 1.97
@@ -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
-%define buildforkernels akmod
+%define buildforkernels current
Name: nvidia-kmod
Epoch: 1
Version: 295.20
# 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
@@ -25,6 +25,8 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
+Patch0: kernel-3.3.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -46,6 +48,13 @@
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile
%{SOURCE11} --obsolete-name nvidia-newest --obsolete-version "%{version}"
%{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"}
2>/dev/null
%setup -q -c -T -a 0
+# patch loop
+for arch in x86 x86_64
+do
+pushd nvidiapkg-${arch}
+%patch0 -p1
+popd
+done
for kernel_version in %{?kernel_versions} ; do
%ifarch %{ix86}
@@ -77,6 +86,9 @@
%changelog
+* Thu Mar 22 2012 leigh scott <leigh123linux(a)googlemail.com> - 1:295.20-2
+- patched to build with 3.3.0 kernel
+
* Tue Feb 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:295.20-1
- Update to 295.20