diff options
| author |   John Mylchreest <johnm@gentoo.org> | 2004-11-26 02:08:27 +0000 |
|---|---|---|
| committer | John Mylchreest <johnm@gentoo.org> | 2004-11-26 02:08:27 +0000 |
| commit | dbec7b1d39b45f42373e13c260282267a477ed07 (patch) | |
| tree | 5c816441aeddcf248401fdcc155ff74b82111bd6 /eclass | |
| parent | cleaning up pkg_setup. (diff) | |
| download | gentoo-2-dbec7b1d39b45f42373e13c260282267a477ed07.tar.gz gentoo-2-dbec7b1d39b45f42373e13c260282267a477ed07.tar.bz2 gentoo-2-dbec7b1d39b45f42373e13c260282267a477ed07.zip | |
cleaning up mish-mash of S= and things. and also making sure that if we dont recalc KV, OKV etc, that we at least re-set to S to what it should be in our case.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kernel-2.eclass | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index bc98604f701a..a9dec4029792 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.52 2004/11/26 01:49:05 johnm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.53 2004/11/26 02:08:27 johnm Exp $ # kernel.eclass rewrite for a clean base regarding the 2.6 series of kernel # with back-compatibility for 2.4 @@ -152,10 +152,6 @@ universal_unpack() { die "Unable to move source tree to ${KV}." fi - # since pkg_setup sets S, and then portage resets S we - # need to re-set S= or it wont be correct. - S="${WORKDIR}/linux-${KV}" - cd ${S} # change incorrect install path [ -z "${K_NOFIXINSTALL_PATH}" ] && \ @@ -575,7 +571,14 @@ 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) - [ -n "${DETECTED}" ] && return + # if ${DETECTED} is still set then we must know about all this other stuff + # too, so lets just reset S and be done with it + if [ -n "${DETECTED}" ]; + then + # set S properly again shall we? + S=${WORKDIR}/linux-${KV} + return + fi if [ -z "${OKV}" ]; then |