From 9f10971a6ca1ddc4a8f6305ebf4563cb93ce6ca6 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sun, 6 Sep 2009 23:38:00 +0000 Subject: Use proper kernel_is function to compare properly including the 4 argument of the kernel version. (Portage version: 2.2_rc40/cvs/Linux x86_64) --- sys-fs/udev/ChangeLog | 6 +++++- sys-fs/udev/udev-145-r1.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'sys-fs/udev') diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog index d3ce55273d9e..a441261563ba 100644 --- a/sys-fs/udev/ChangeLog +++ b/sys-fs/udev/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/udev # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.489 2009/09/06 12:41:53 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.490 2009/09/06 23:38:00 robbat2 Exp $ + + 06 Sep 2009; Robin H. Johnson udev-145-r1.ebuild: + Use proper kernel_is function to compare properly including the 4 argument + of the kernel version. 06 Sep 2009; Matthias Schwarzott udev-145-r1.ebuild: Only execute the lib->lib64 move code if it is really needed, bug #281338. diff --git a/sys-fs/udev/udev-145-r1.ebuild b/sys-fs/udev/udev-145-r1.ebuild index c6bab42fbfe2..31a79342b35a 100644 --- a/sys-fs/udev/udev-145-r1.ebuild +++ b/sys-fs/udev/udev-145-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r1.ebuild,v 1.5 2009/09/06 12:41:53 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-145-r1.ebuild,v 1.6 2009/09/06 23:38:00 robbat2 Exp $ EAPI="1" @@ -60,9 +60,9 @@ udev_check_KV() { local ok=0 if [[ ${KV_MAJOR} == 2 && ${KV_MINOR} == 6 ]] then - if [[ ${KV_PATCH} -ge ${KV_PATCH_reliable} ]]; then + if kernel_is -ge 2 6 ${KV_PATCH_reliable} ; then ok=2 - elif [[ ${KV_PATCH} -ge ${KV_PATCH_min} ]]; then + elif kernel_is -ge 2 6 ${KV_PATCH_min} ; then ok=1 fi fi @@ -89,7 +89,7 @@ pkg_setup() { echo # We don't care about the secondary revision of the kernel. # 2.6.30.4 -> 2.6.30 is all we check - KV_PATCH="${KV_PATCH%.*}" udev_check_KV + udev_check_KV case "$?" in 2) einfo "Your kernel version (${KV_FULL}) is new enough to run ${P} reliable." ;; 1) ewarn "Your kernel version (${KV_FULL}) is new enough to run ${P}," @@ -102,7 +102,7 @@ pkg_setup() { KV_FULL_SRC=${KV_FULL} get_running_version - KV_PATCH="${KV_PATCH%.*}" udev_check_KV + udev_check_KV if [[ "$?" = "0" ]]; then eerror eerror "udev cannot be restarted after emerging," -- cgit v1.2.3-65-gdbad