| 1 |
vapier 11/12/02 04:19:45 |
| 2 |
|
| 3 |
Modified: kernel-2.eclass |
| 4 |
Log: |
| 5 |
simplify kernel_is logic |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.269 eclass/kernel-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.269&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.269&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.268&r2=1.269 |
| 13 |
|
| 14 |
Index: kernel-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 17 |
retrieving revision 1.268 |
| 18 |
retrieving revision 1.269 |
| 19 |
diff -u -r1.268 -r1.269 |
| 20 |
--- kernel-2.eclass 2 Dec 2011 02:37:50 -0000 1.268 |
| 21 |
+++ kernel-2.eclass 2 Dec 2011 04:19:45 -0000 1.269 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2011 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.268 2011/12/02 02:37:50 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.269 2011/12/02 04:19:45 vapier Exp $ |
| 27 |
|
| 28 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 29 |
# series of kernel with back-compatibility for 2.4 |
| 30 |
@@ -394,9 +394,9 @@ |
| 31 |
unset v n |
| 32 |
|
| 33 |
# Now we can continue |
| 34 |
- local operator test value x=0 y=0 z=0 |
| 35 |
+ local operator test value |
| 36 |
|
| 37 |
- case ${1} in |
| 38 |
+ case $1 in |
| 39 |
lt) operator="-lt"; shift;; |
| 40 |
gt) operator="-gt"; shift;; |
| 41 |
le) operator="-le"; shift;; |
| 42 |
@@ -404,24 +404,11 @@ |
| 43 |
eq) operator="-eq"; shift;; |
| 44 |
*) operator="-eq";; |
| 45 |
esac |
| 46 |
+ [[ $# -gt 3 ]] && die "Error in kernel-2_kernel_is(): too many parameters" |
| 47 |
|
| 48 |
- for x in ${@}; do |
| 49 |
- for((y=0; y<$((3 - ${#x})); y++)); do value="${value}0"; done |
| 50 |
- value="${value}${x}" |
| 51 |
- z=$((${z} + 1)) |
| 52 |
- |
| 53 |
- case ${z} in |
| 54 |
- 1) for((y=0; y<$((3 - ${#KV_MAJOR})); y++)); do test="${test}0"; done; |
| 55 |
- test="${test}${KV_MAJOR}";; |
| 56 |
- 2) for((y=0; y<$((3 - ${#KV_MINOR})); y++)); do test="${test}0"; done; |
| 57 |
- test="${test}${KV_MINOR}";; |
| 58 |
- 3) for((y=0; y<$((3 - ${#KV_PATCH})); y++)); do test="${test}0"; done; |
| 59 |
- test="${test}${KV_PATCH}";; |
| 60 |
- *) die "Error in kernel-2_kernel_is(): Too many parameters.";; |
| 61 |
- esac |
| 62 |
- done |
| 63 |
- |
| 64 |
- [ ${test} ${operator} ${value} ] && return 0 || return 1 |
| 65 |
+ : $(( value = (KV_MAJOR << 16) + (KV_MINOR << 8) + KV_PATCH )) |
| 66 |
+ : $(( test = (${1:-${KV_MAJOR}} << 16) + (${2:-${KV_MINOR}} << 8) + ${3:-${KV_PATCH}} )) |
| 67 |
+ [ ${test} ${operator} ${value} ] |
| 68 |
} |
| 69 |
|
| 70 |
kernel_is_2_4() { |
Archives