summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJohn Mylchreest <johnm@gentoo.org>2003-11-18 19:40:01 +0000
committerJohn Mylchreest <johnm@gentoo.org>2003-11-18 19:40:01 +0000
commit802c72b2504c47a1aeb4a01545b6aff00498ed7e (patch)
treefe7d1e25a63e599aa378c42b77e257c1d4ccef47 /eclass
parentI did not use REAL_CHOST in all cases, ending up with /usr/bin/-gcc, etc (diff)
downloadgentoo-2-802c72b2504c47a1aeb4a01545b6aff00498ed7e.tar.gz
gentoo-2-802c72b2504c47a1aeb4a01545b6aff00498ed7e.tar.bz2
gentoo-2-802c72b2504c47a1aeb4a01545b6aff00498ed7e.zip
EXTRAVERSION was still set for vanilla sources, added the exclude for vanilla-*, changing where the verification is now done.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kernel.eclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/kernel.eclass b/eclass/kernel.eclass
index cc6df0415b67..e7cccd754391 100644
--- a/eclass/kernel.eclass
+++ b/eclass/kernel.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel.eclass,v 1.38 2003/11/18 19:26:07 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel.eclass,v 1.39 2003/11/18 19:40:01 johnm Exp $
#
# This eclass contains the common functions to be used by all lostlogic
# based kernel ebuilds
@@ -13,9 +13,9 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_preinst pkg_postinst
# OKV=original kernel version, KV=patched kernel version. They can be the same.
[ -z "${OKV}" ] && OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-if [ -z "${EXTRAVERSION}" ]
+if [ -z "${EXTRAVERSION}" -a "${PN/-*/}" != "linux" -a "${PN/-*/}" != "vanilla" ]
then
- [ "${PN/-*/}" != "linux" -a "${PN/-*/}" != "vanilla" ] && EXTRAVERSION="${PN/-*/}"
+ EXTRAVERSION="${PN/-*/}"
[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
[ -n "${EXTRAVERSION}" ] && EXTRAVERSION="-${EXTRAVERSION}"
KV="${OKV}${EXTRAVERSION}"