diff options
| author |   Jason Cox <steel300@gentoo.org> | 2004-04-29 12:55:53 +0000 |
|---|---|---|
| committer | Jason Cox <steel300@gentoo.org> | 2004-04-29 12:55:53 +0000 |
| commit | 7835db00075ab1fa1ac33f120a1734839dbdba89 (patch) | |
| tree | df26334e326cac3731dea5556cde9bf99a4aebd6 /media-video | |
| parent | Stable on sparc. (Manifest recommit) (diff) | |
| download | gentoo-2-7835db00075ab1fa1ac33f120a1734839dbdba89.tar.gz gentoo-2-7835db00075ab1fa1ac33f120a1734839dbdba89.tar.bz2 gentoo-2-7835db00075ab1fa1ac33f120a1734839dbdba89.zip | |
Fix is_kernel syntax warnings
Diffstat (limited to 'media-video')
4 files changed, 39 insertions, 29 deletions
diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog index b1e199d0b2a1..2a8f00fc1727 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.70 2004/04/29 10:19:48 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.71 2004/04/29 12:55:53 steel300 Exp $ + + 29 Apr 2004; <coxj@gentoo.org> nvidia-kernel-1.0.4496-r3.ebuild, + nvidia-kernel-1.0.4499.ebuild, nvidia-kernel-1.0.5328-r1.ebuild: + Fix is_kernel syntax bugs 28 Apr 2004; <coxj@gentoo.org> nvidia-kernel-1.0.4363-r3.ebuild, nvidia-kernel-1.0.4496-r3.ebuild, nvidia-kernel-1.0.4499.ebuild: diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild index 01da4184a61c..d44dd3d5fd7d 100644 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.4496-r3.ebuild,v 1.7 2004/04/28 22:19:49 steel300 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4496-r3.ebuild,v 1.8 2004/04/29 12:55:53 steel300 Exp $ inherit eutils @@ -57,6 +57,19 @@ get_KV_info() { export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')" } +is_kernel() { + [ -z "$1" -o -z "$2" ] && return 1 + + get_KV_info + + if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ] + then + return 0 + else + return 1 + fi +} + src_unpack() { cd ${WORKDIR} bash ${DISTDIR}/${NV_PACKAGE}-pkg0.run --extract-only diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild index b9e96c70ed59..73d161edbb58 100644 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.4499.ebuild,v 1.5 2004/04/28 22:19:49 steel300 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.4499.ebuild,v 1.6 2004/04/29 12:55:53 steel300 Exp $ inherit eutils @@ -57,6 +57,19 @@ get_KV_info() { export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')" } +is_kernel() { + [ -z "$1" -o -z "$2" ] && return 1 + + get_KV_info + + if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ] + then + return 0 + else + return 1 + fi +} + src_unpack() { cd ${WORKDIR} unpack NVIDIA_kernel-1.0-4499.tar.gz diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild index c6438ab544d6..7624e4809e74 100644 --- a/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild +++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.5328-r1.ebuild,v 1.3 2004/01/29 09:55:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.5328-r1.ebuild,v 1.4 2004/04/29 12:55:53 steel300 Exp $ inherit eutils @@ -59,32 +59,12 @@ get_KV_info() { export KV_micro="$(echo "${KV_full}" | cut -d. -f3 | sed -e 's:[^0-9].*::')" } -is_2_4_kernel() { - get_KV_info - - if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 4 ] - then - return 0 - else - return 1 - fi -} - -is_2_5_kernel() { - get_KV_info - - if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 5 ] - then - return 0 - else - return 1 - fi -} +is_kernel() { + [ -z "$1" -o -z "$2" ] && return 1 -is_2_6_kernel() { get_KV_info - if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 6 ] + if [ "${KV_major}" -eq "$1" -a "${KV_minor}" -eq "$2" ] then return 0 else @@ -109,7 +89,7 @@ src_unpack() { cd ${S} einfo "Linux kernel ${KV_major}.${KV_minor}.${KV_micro}" - if is_2_5_kernel || is_2_6_kernel + if is_kernel 2.5 || is_kernel 2.6 then EPATCH_SINGLE_MSG="Applying tasklet patch ..." \ epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-2.6-20040105.diff @@ -118,7 +98,7 @@ src_unpack() { ln -snf Makefile.nvidia Makefile fi - if is_2_4_kernel + if is_kernel 2.4 then EPATCH_SINGLE_MSG="Applying VIA chipset bugfix patch ..." \ epatch ${FILESDIR}/${PV}/NVIDIA_kernel-${NV_V}-2.4-via-chipset-fix.patch |