rpms/nvidia-96xx-kmod/F-17 conftest.patch, 1.1, 1.2 nvidia-96xx-kmod.spec, 1.64, 1.65
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5023/F-17
Modified Files:
conftest.patch nvidia-96xx-kmod.spec
Log Message:
Update patch
conftest.patch:
conftest.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Index: conftest.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/F-17/conftest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conftest.patch 5 Feb 2013 15:19:13 -0000 1.1
+++ conftest.patch 16 Feb 2013 17:39:31 -0000 1.2
@@ -1,11 +1,24 @@
---- a/usr/src/nv/conftest.sh
-+++ b/usr/src/nv/conftest.sh
-@@ -1703,7 +1703,7 @@ case "$6" in
+the nvidia drivers are trying to test for version 2.6.6, but fail to take into
+account the first digit. so 3.7.0+ ends up failing the test.
+
+https://bugs.gentoo.org/447566
+
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -1697,13 +1697,15 @@
+ # kernel older than 2.6.6, that's all we require to
+ # build the module.
+ #
++ VERSION=$(grep "^VERSION =" $MAKEFILE | cut -d " "
-f 3)
+ PATCHLEVEL=$(grep "^PATCHLEVEL =" $MAKEFILE | cut -d "
" -f 3)
SUBLEVEL=$(grep "^SUBLEVEL =" $MAKEFILE | cut -d " "
-f 3)
- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
-- -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
-+ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 6 ]; then
+- if [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
++ if [ -n "$VERSION" -a $VERSION -ge 3 ] || \
++ [ -n "$PATCHLEVEL" -a $PATCHLEVEL -ge 6 \
+ -a -n "$SUBLEVEL" -a $SUBLEVEL -le 5 ]; then
SELECTED_MAKEFILE=Makefile.kbuild
RET=0
fi
+ fi
+ fi
Index: nvidia-96xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/F-17/nvidia-96xx-kmod.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- nvidia-96xx-kmod.spec 16 Feb 2013 12:00:06 -0000 1.64
+++ nvidia-96xx-kmod.spec 16 Feb 2013 17:39:32 -0000 1.65
@@ -7,7 +7,7 @@
Name: nvidia-96xx-kmod
Version: 96.43.23
-Release: 3%{?dist}.2
+Release: 4%{?dist}
# Taken over by kmodtool
Summary: NVIDIA 96xx display driver kernel module
Group: System Environment/Kernel
@@ -50,7 +50,9 @@
do
pushd nvidiapkg-${arch}
%patch0 -p1
-%patch1 -p1
+ pushd usr/src/nv
+%patch1 -p2
+ popd
popd
done
@@ -94,6 +96,9 @@
%changelog
+* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.23-4
+- Update patch from gentoo
+
* Sat Feb 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.23-3.2
- Rebuilt for kernel