summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-02-17 23:19:03 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-02-17 23:19:03 +0000
commit39b0c26c66faa5a6931373b18c3c16e845ef82b1 (patch)
treed46355b368ff998a05711c2649bde049fd18c513 /media-video/nvidia-kernel
parentAdd arm architecture description (diff)
downloadgentoo-2-39b0c26c66faa5a6931373b18c3c16e845ef82b1.tar.gz
gentoo-2-39b0c26c66faa5a6931373b18c3c16e845ef82b1.tar.bz2
gentoo-2-39b0c26c66faa5a6931373b18c3c16e845ef82b1.zip
kernel 2.5.61 support
Diffstat (limited to 'media-video/nvidia-kernel')
-rw-r--r--media-video/nvidia-kernel/ChangeLog6
-rw-r--r--media-video/nvidia-kernel/files/NVIDIA_kernel-1.0-4191-2.5.61.diff12
-rw-r--r--media-video/nvidia-kernel/nvidia-kernel-1.0.4191-r1.ebuild8
3 files changed, 24 insertions, 2 deletions
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index c3cf1fee5d3f..f49c962c9760 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/nvidia-kernel
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.22 2003/02/17 21:24:29 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.23 2003/02/17 23:19:03 azarah Exp $
+
+ 17 Feb 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.4191-r1.ebuild :
+
+ Patch to handle changed include location in 2.5.61+, bug #15846.
20 Jan 2003; Martin Schlemmer <azarah@gentoo.org> nvidia-kernel-1.0.3123-r2.ebuild :
diff --git a/media-video/nvidia-kernel/files/NVIDIA_kernel-1.0-4191-2.5.61.diff b/media-video/nvidia-kernel/files/NVIDIA_kernel-1.0-4191-2.5.61.diff
new file mode 100644
index 000000000000..63d64cafce6b
--- /dev/null
+++ b/media-video/nvidia-kernel/files/NVIDIA_kernel-1.0-4191-2.5.61.diff
@@ -0,0 +1,12 @@
+diff -urN NVIDIA_kernel-1.0-4191/nv-linux.h NVIDIA_kernel-1.0-4191-2.5.61/nv-linux.h
+--- NVIDIA_kernel-1.0-4191/nv-linux.h 2002-12-09 14:27:15.000000000 -0600
++++ NVIDIA_kernel-1.0-4191-2.5.61/nv-linux.h 2003-02-17 08:20:21.000000000 -0600
+@@ -21,7 +21,7 @@
+ #endif
+
+ #if defined (MODVERSIONS)
+-#include <linux/modversions.h>
++#include <config/modversions.h>
+ #endif
+
+ #include <linux/kernel.h>
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4191-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4191-r1.ebuild
index a177153f47e5..2d9adba9b5ff 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4191-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4191-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4191-r1.ebuild,v 1.6 2003/02/17 21:24:29 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4191-r1.ebuild,v 1.7 2003/02/17 23:19:03 azarah Exp $
inherit eutils
@@ -67,6 +67,12 @@ src_unpack() {
EPATCH_SINGLE_MSG="Applying module loader no common sections..." \
epatch ${FILESDIR}/${NV_PACKAGE}-2.5.54.diff
fi
+
+ if [ "${KV_micro}" -gt 60 ]
+ then
+ EPATCH_SINGLE_MSG="Applying include patch for 2.5.61+..." \
+ epatch ${FILESDIR}/${NV_PACKAGE}-2.5.61.diff
+ fi
else
# This is a minor patch to make it work with rmap enabled kernels
EPATCH_SINGLE_MSG="Applying rmap compat patch for kernel 2.4..."