summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mylchreest <johnm@gentoo.org>2005-02-09 11:23:25 +0000
committerJohn Mylchreest <johnm@gentoo.org>2005-02-09 11:23:25 +0000
commit88ea1de7b06f07e7d13b3462579a6403bcee57ba (patch)
tree1e1ec2baa708c71e17d1f0ab35d2daf40f5b1ced /eclass/kernel-2.eclass
parentMarked ppc (diff)
downloadhistorical-88ea1de7b06f07e7d13b3462579a6403bcee57ba.tar.gz
historical-88ea1de7b06f07e7d13b3462579a6403bcee57ba.tar.bz2
historical-88ea1de7b06f07e7d13b3462579a6403bcee57ba.zip
Fixing up _p and _r support in OKV
Diffstat (limited to 'eclass/kernel-2.eclass')
-rw-r--r--eclass/kernel-2.eclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 3ac5369c96e4..6f60a955060a 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.96 2005/02/08 22:24:02 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.97 2005/02/09 11:23:25 johnm Exp $
# Description: kernel.eclass rewrite for a clean base regarding the 2.6
# series of kernel with back-compatibility for 2.4
@@ -603,8 +603,9 @@ detect_version() {
CKV=${CKV:-${PV}}
OKV=${OKV:-${CKV}}
OKV=${OKV/_beta/-test}
- OKV=${OKV/_rc*}
- OKV=${OKV/_pre*}
+ OKV=${OKV/_rc/-rc}
+ OKV=${OKV/-r*}
+ OKV=${OKV/_p*}
KV_MAJOR=$(get_version_component_range 1 ${OKV})
KV_MINOR=$(get_version_component_range 2 ${OKV})