summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mylchreest <johnm@gentoo.org>2004-01-22 21:44:47 +0000
committerJohn Mylchreest <johnm@gentoo.org>2004-01-22 21:44:47 +0000
commit1cf4acdc40405304910e4a6a789622067e3f6c6d (patch)
tree953a76d9190c3af0acc6cc3bc956ab7765b8903d /eclass/kernel-2.eclass
parentcleanup (diff)
downloadgentoo-2-1cf4acdc40405304910e4a6a789622067e3f6c6d.tar.gz
gentoo-2-1cf4acdc40405304910e4a6a789622067e3f6c6d.tar.bz2
gentoo-2-1cf4acdc40405304910e4a6a789622067e3f6c6d.zip
adding support for K_PREPATCHED. this will use for the patchset release, ie: 2.6.1-r5 = 2.6.1-mm5 for mm-sources.
Diffstat (limited to 'eclass/kernel-2.eclass')
-rw-r--r--eclass/kernel-2.eclass15
1 files changed, 12 insertions, 3 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index e11fdc713250..85db0f25d0fc 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@@ -15,6 +15,9 @@
#
# K_NOSETEXTRAVERSION - if this is set then EXTRAVERSION will not be automatically set within the kernel Makefile
# K_NOUSENAME - if this is set then EXTRAVERSION will not include the first part of ${PN} in EXTRAVERSION
+# K_PREPATCHED - if the patchset is prepatched (ie: mm-sources, ck-sources, ac-sources) it will use PR (ie: -r5) as the patchset version for EXTRAVERSION
+# - and not use it as a true package revision
+#
# K_EXTRAEINFO - this is a new-line seperated list of einfo displays in postinst and can be used to carry additional postinst messages
# K_EXTRAEWARN - same as K_EXTRAEINFO except ewarn's instead of einfo's
# UNIPATCH_LIST - space delimetered list of patches to be applied to the kernel
@@ -377,10 +380,16 @@ detect_version() {
RELEASETYPE=${RELEASE//[0-9]/}
EXTRAVERSION="${RELEASE}"
- [ -z "${K_NOUSENAME}" ] && EXTRAVERSION="${EXTRAVERSION}-${PN/-*/}"
- [ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
- KV=${OKV}${EXTRAVERSION}
+ if [ -n "${K_PREPATCHED}" ]
+ then
+ KV="${OKV}-${PN/-*/}${PR/r/}"
+ else
+ [ -z "${K_NOUSENAME}" ] && EXTRAVERSION="${EXTRAVERSION}-${PN/-*/}"
+ [ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+
+ KV=${OKV}${EXTRAVERSION}
+ fi
# -rcXX-bkXX pulls are *IMPOSSIBLE* to support within the portage naming convention
# these cannot be supported, but the code here can handle it up until this point