| 1 |
mpagano 15/02/27 23:44:41 |
| 2 |
|
| 3 |
Modified: ChangeLog kernel-2.eclass |
| 4 |
Log: |
| 5 |
Cleanup how we determine base linux tarball. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1557 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1557&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1557&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1556&r2=1.1557 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1556 |
| 18 |
retrieving revision 1.1557 |
| 19 |
diff -u -r1.1556 -r1.1557 |
| 20 |
--- ChangeLog 26 Feb 2015 20:41:10 -0000 1.1556 |
| 21 |
+++ ChangeLog 27 Feb 2015 23:44:41 -0000 1.1557 |
| 22 |
@@ -1,6 +1,9 @@ |
| 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.1556 2015/02/26 20:41:10 axs Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1557 2015/02/27 23:44:41 mpagano Exp $ |
| 27 |
+ |
| 28 |
+ 27 Feb 2015; Mike Pagano <mpagano@g.o> kernel-2.eclass: |
| 29 |
+ Cleanup how we determine base linux tarball. |
| 30 |
|
| 31 |
26 Feb 2015; Ian Stakenvicius (_AxS_) <axs@g.o> |
| 32 |
mozconfig-v5.31.eclass, +mozconfig-v5.36.eclass: |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.300 eclass/kernel-2.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.300&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.300&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.299&r2=1.300 |
| 41 |
|
| 42 |
Index: kernel-2.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v |
| 45 |
retrieving revision 1.299 |
| 46 |
retrieving revision 1.300 |
| 47 |
diff -u -r1.299 -r1.300 |
| 48 |
--- kernel-2.eclass 23 Feb 2015 12:42:40 -0000 1.299 |
| 49 |
+++ kernel-2.eclass 27 Feb 2015 23:44:41 -0000 1.300 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2015 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.299 2015/02/23 12:42:40 mpagano Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.300 2015/02/27 23:44:41 mpagano Exp $ |
| 55 |
|
| 56 |
# Description: kernel.eclass rewrite for a clean base regarding the 2.6 |
| 57 |
# series of kernel with back-compatibility for 2.4 |
| 58 |
@@ -371,15 +371,12 @@ |
| 59 |
UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz" |
| 60 |
fi |
| 61 |
else |
| 62 |
+ KV_PATCH_ARR=(${KV_PATCH//\./ }) |
| 63 |
+ |
| 64 |
+ # the different majorminor versions have different patch start versions |
| 65 |
+ OKV_DICT=(["2"]="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" ["3"]="2.6.39" ["4"]="3.19") |
| 66 |
if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then |
| 67 |
- if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then |
| 68 |
- OKV="2.6.39" |
| 69 |
- elif [[ ${KV_MAJOR}${KV_PATCH} -eq 40 ]]; then |
| 70 |
- OKV="3.19" |
| 71 |
- else |
| 72 |
- KV_PATCH_ARR=(${KV_PATCH//\./ }) |
| 73 |
- OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" |
| 74 |
- fi |
| 75 |
+ OKV=${OKV_DICT["${KV_MAJOR}"]} |
| 76 |
KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz |
| 77 |
${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" |
| 78 |
UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz" |
| 79 |
@@ -392,14 +389,7 @@ |
| 80 |
fi |
| 81 |
|
| 82 |
if [[ ${RELEASETYPE} == -rc-git ]]; then |
| 83 |
- if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then |
| 84 |
- OKV="2.6.39" |
| 85 |
- elif [[ ${KV_MAJOR}${KV_PATCH} -eq 40 ]]; then |
| 86 |
- OKV="2.19" |
| 87 |
- else |
| 88 |
- KV_PATCH_ARR=(${KV_PATCH//\./ }) |
| 89 |
- OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" |
| 90 |
- fi |
| 91 |
+ OKV=${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" |
| 95 |
@@ -409,8 +399,7 @@ |
| 96 |
|
| 97 |
|
| 98 |
fi |
| 99 |
- |
| 100 |
- |
| 101 |
+ |
| 102 |
debug-print-kernel2-variables |
| 103 |
|
| 104 |
handle_genpatches |
Archives