| 1 |
mpagano 15/04/29 00:07:30 |
| 2 |
|
| 3 |
Modified: ChangeLog kernel-2.eclass |
| 4 |
Log: |
| 5 |
Add kernel-2 env var K_BASE_VER as different versions of git sources use different base versions. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1598 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1598&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1598&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1597&r2=1.1598 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1597 |
| 18 |
retrieving revision 1.1598 |
| 19 |
diff -u -r1.1597 -r1.1598 |
| 20 |
--- ChangeLog 28 Apr 2015 20:35:40 -0000 1.1597 |
| 21 |
+++ ChangeLog 29 Apr 2015 00:07:30 -0000 1.1598 |
| 22 |
@@ -1,6 +1,10 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1597 2015/04/28 20:35:40 chewi Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1598 2015/04/29 00:07:30 mpagano Exp $ |
| 27 |
+ |
| 28 |
+ 29 Apr 2015; Mike Pagano <mpagano@g.o> kernel-2.eclass: |
| 29 |
+ Add kernel-2 env var K_BASE_VER as different versions of git sources use |
| 30 |
+ different base versions. |
| 31 |
|
| 32 |
28 Apr 2015; James Le Cuirot <chewi@g.o> java-pkg-2.eclass, |
| 33 |
java-utils-2.eclass, ant-tasks.eclass: |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.303 eclass/kernel-2.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.303&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.303&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.302&r2=1.303 |
| 42 |
|
| 43 |
Index: kernel-2.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 46 |
retrieving revision 1.302 |
| 47 |
retrieving revision 1.303 |
| 48 |
diff -u -r1.302 -r1.303 |
| 49 |
--- kernel-2.eclass 27 Apr 2015 18:59:42 -0000 1.302 |
| 50 |
+++ kernel-2.eclass 29 Apr 2015 00:07:30 -0000 1.303 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2015 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.302 2015/04/27 18:59:42 mpagano Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.303 2015/04/29 00:07:30 mpagano Exp $ |
| 56 |
|
| 57 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 58 |
# series of kernel with back-compatibility for 2.4 |
| 59 |
@@ -37,6 +37,8 @@ |
| 60 |
# K_EXTRAEWARN - same as K_EXTRAEINFO except using ewarn instead of einfo |
| 61 |
# K_SYMLINK - if this is set, then forcably create symlink anyway |
| 62 |
# |
| 63 |
+# K_BASE_VER - for git-sources, declare the base version this patch is |
| 64 |
+# based off of. |
| 65 |
# K_DEFCONFIG - Allow specifying a different defconfig target. |
| 66 |
# If length zero, defaults to "defconfig". |
| 67 |
# K_WANT_GENPATCHES - Apply genpatches to kernel source. Provide any |
| 68 |
@@ -363,14 +365,10 @@ |
| 69 |
KV_PATCH_ARR=(${KV_PATCH//\./ }) |
| 70 |
|
| 71 |
# the different majorminor versions have different patch start versions |
| 72 |
- OKV_DICT=(["2"]="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" ["3"]="2.6.39" ["4"]="3.19" ["41"] = "4.0") |
| 73 |
+ OKV_DICT=(["2"]="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" ["3"]="2.6.39" ["4"]="3.19") |
| 74 |
+ |
| 75 |
if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then |
| 76 |
- OKV=${OKV_DICT["${KV_MAJOR}"]} |
| 77 |
- if [[ ${KV_MAJOR} -ge 4 ]] && [[ ${KV_PATCH_ARR} -ge 1 ]]; then |
| 78 |
- OKV=${OKV_DICT["${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"]} |
| 79 |
- else |
| 80 |
- OKV=${OKV_DICT["${KV_MAJOR}"]} |
| 81 |
- fi |
| 82 |
+ OKV=${K_BASE_VER:-$OKV_DICT["${KV_MAJOR}"]} |
| 83 |
KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz |
| 84 |
${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" |
| 85 |
UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz" |
| 86 |
@@ -383,7 +381,7 @@ |
| 87 |
fi |
| 88 |
|
| 89 |
if [[ ${RELEASETYPE} == -rc-git ]]; then |
| 90 |
- OKV=${OKV_DICT["${KV_MAJOR}"]} |
| 91 |
+ OKV=${K_BASE_VER:-$OKV_DICT["${KV_MAJOR}"]} |
| 92 |
KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz |
| 93 |
${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz |
| 94 |
${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" |
Archives