diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-12-10 07:57:59 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-12-10 07:57:59 +0000 |
| commit | 92baffad532cf3da59a4574630bad3275e2d6834 (patch) | |
| tree | c9c3b3f8dd0dcb1387021d284e7c451adf063368 /eclass | |
| parent | new x32 abi profiles (diff) | |
| download | gentoo-2-92baffad532cf3da59a4574630bad3275e2d6834.tar.gz gentoo-2-92baffad532cf3da59a4574630bad3275e2d6834.tar.bz2 gentoo-2-92baffad532cf3da59a4574630bad3275e2d6834.zip | |
do not reset S when we have already run through detect_version so it wont clobber an existing S value #380999
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kernel-2.eclass | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 194001b2cd5b..5288e4e50b5f 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.271 2011/12/08 19:39:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.272 2011/12/10 07:57:59 vapier Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -146,14 +146,8 @@ detect_version() { # - KV: Kernel Version (2.6.0-gentoo/2.6.0-test11-gentoo-r1) # - EXTRAVERSION: The additional version appended to OKV (-gentoo/-gentoo-r1) - if [[ -n ${KV_FULL} ]]; then - # we will set this for backwards compatibility. - KV=${KV_FULL} - - # we know KV_FULL so lets stop here. but not without resetting S - S=${WORKDIR}/linux-${KV_FULL} - return - fi + # We've already run, so nothing to do here. + [[ -n ${KV_FULL} ]] && return 0 # CKV is used as a comparison kernel version, which is used when # PV doesnt reflect the genuine kernel version. |