diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-04-23 04:34:34 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-04-23 04:34:34 +0000 |
commit | 94f7fab31574e8b841c326e62aeb123f7d66f544 (patch) | |
tree | a741e1bda90b69715201eaac9b4b677622524d31 /media-video | |
parent | fix the 2.5.68 patch to only apply if the irq changes are present (diff) | |
download | historical-94f7fab31574e8b841c326e62aeb123f7d66f544.tar.gz historical-94f7fab31574e8b841c326e62aeb123f7d66f544.tar.bz2 historical-94f7fab31574e8b841c326e62aeb123f7d66f544.zip |
fix the 2.5.68 patch to only apply if the irq changes are present
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/nvidia-kernel/Manifest | 4 | ||||
-rw-r--r-- | media-video/nvidia-kernel/nvidia-kernel-1.0.4349-r2.ebuild | 34 |
2 files changed, 9 insertions, 29 deletions
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest index 782a99f350b5..bf815d8f0d89 100644 --- a/media-video/nvidia-kernel/Manifest +++ b/media-video/nvidia-kernel/Manifest @@ -1,11 +1,11 @@ -MD5 e570ccee4ab7346564ce8d1ae3fb806c ChangeLog 6081 +MD5 be2f10eccc46c06687da6f38d8554941 ChangeLog 6081 MD5 04b1f361d40708ab81631bea5e46a632 nvidia-kernel-1.0.2880-r1.ebuild 1970 MD5 5177ed76121fb4bc1aa220c62319d196 nvidia-kernel-1.0.2960-r1.ebuild 2081 MD5 4fc62b5769bfcbb15e69c27860bc27e7 nvidia-kernel-1.0.4191-r2.ebuild 3870 MD5 16a9003f79bea31eeec6f03ae64cd8ef nvidia-kernel-1.0.3123-r2.ebuild 3229 MD5 10e07a6ec08e11dab21341ae06788e78 nvidia-kernel-1.0.4349.ebuild 4201 MD5 e64884b31959fdf80e8abc6016f63e34 nvidia-kernel-1.0.4349-r1.ebuild 4219 -MD5 461b5bda8489f166f800efef6d3a43e7 nvidia-kernel-1.0.4349-r2.ebuild 3702 +MD5 0646bd1f1f1109063862d1475aaccab4 nvidia-kernel-1.0.4349-r2.ebuild 3702 MD5 c66873e3c55fd472cc99da1b74499c03 files/digest-nvidia-kernel-1.0.4349-r1 74 MD5 4057597a09dd795c93ce8088d6f023bb files/NVIDIA_kernel-1.0-3123-2.5-tl-pa.diff 11858 MD5 059b3ddf8944dce6c9184d11d15abd71 files/NVIDIA_kernel-1.0-3123-2.5-tl.diff 31614 diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4349-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4349-r2.ebuild index 19e6489fac7b..d9a6f82c886f 100644 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4349-r2.ebuild +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4349-r2.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.4349-r2.ebuild,v 1.1 2003/04/22 20:44:46 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4349-r2.ebuild,v 1.2 2003/04/23 04:33:52 azarah Exp $ inherit eutils @@ -64,36 +64,16 @@ src_unpack() { EPATCH_SINGLE_MSG="Applying tasklet patch for kernel 2.5..." \ epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-2.5-20030402.diff - EPATCH_SINGLE_MSG="Applying patch for devfs/irq changes in 2.5.68+..." \ - epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-2.5.68.diff + if [ "${KV_micro}" -ge 68 ] && \ + [ -n "`grep irqreturn_t /usr/src/linux/include/linux/interrupt.h`" ] + then + EPATCH_SINGLE_MSG="Applying patch for devfs/irq changes in 2.5.68+..." \ + epatch ${FILESDIR}/${PV}/${NV_PACKAGE}-2.5.68.diff + fi # Some problems with kbuild one .. ln -s Makefile.nvidia Makefile fi - -# if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 4 ] && \ -# [ -r /usr/src/linux/mm/rmap.c ] -# then -# einfo "Detected rmap enabled kernel." -# EPATCH_SINGLE_MSG="Applying rmap patch for kernel 2.4..." \ -# epatch ${FILESDIR}/${NV_PACKAGE}-2.5-tl.diff -# -# elif [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 5 ] -# then -# EPATCH_SINGLE_MSG="Applying tasklet patch for kernel 2.5..." \ -# epatch ${FILESDIR}/${NV_PACKAGE}-2.5-tl.diff -# -# if [ "${KV_micro}" -ge 54 ] -# then -# EPATCH_SINGLE_MSG="Applying module_loader_no_common_sections patch..." \ -# epatch ${FILESDIR}/${NV_PACKAGE}-2.5.54.diff -# fi -# if [ "${KV_micro}" -ge 63 ] -# then -# EPATCH_SINGLE_MSG="Applying missing_modversion.h patch..." \ -# epatch ${FILESDIR}/${NV_PACKAGE}-2.5.63.diff -# fi -# fi } src_compile() { |