Gentoo Archives: gentoo-commits

From: "Mike Pagano (mpagano)" <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog kernel-2.eclass
Date: Tue, 28 Apr 2015 14:42:30
Message-Id: 20150427185943.AC46B98C@oystercatcher.gentoo.org
1 mpagano 15/04/27 18:59:42
2
3 Modified: ChangeLog kernel-2.eclass
4 Log:
5 Handle 4.1 base kernel. See bug #547894.
6
7 Revision Changes Path
8 1.1595 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1595&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1595&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1594&r2=1.1595
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.1594
18 retrieving revision 1.1595
19 diff -u -r1.1594 -r1.1595
20 --- ChangeLog 25 Apr 2015 09:13:40 -0000 1.1594
21 +++ ChangeLog 27 Apr 2015 18:59:42 -0000 1.1595
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.1594 2015/04/25 09:13:40 polynomial-c Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1595 2015/04/27 18:59:42 mpagano Exp $
27 +
28 + 27 Apr 2015; Mike Pagano <mpagano@g.o> kernel-2.eclass:
29 + Handle 4.1 base kernel. See bug #547894.
30
31 25 Apr 2015; Lars Wendler <polynomial-c@g.o> mozconfig-v5.36.eclass:
32 Adjusted libvpx dependency.
33
34
35
36 1.302 eclass/kernel-2.eclass
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.302&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.302&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.301&r2=1.302
41
42 Index: kernel-2.eclass
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v
45 retrieving revision 1.301
46 retrieving revision 1.302
47 diff -u -r1.301 -r1.302
48 --- kernel-2.eclass 20 Mar 2015 00:13:32 -0000 1.301
49 +++ kernel-2.eclass 27 Apr 2015 18:59:42 -0000 1.302
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.301 2015/03/20 00:13:32 mpagano Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.302 2015/04/27 18:59:42 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 @@ -363,9 +363,14 @@
59 KV_PATCH_ARR=(${KV_PATCH//\./ })
60
61 # the different majorminor versions have different patch start versions
62 - OKV_DICT=(["2"]="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" ["3"]="2.6.39" ["4"]="3.19")
63 + OKV_DICT=(["2"]="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" ["3"]="2.6.39" ["4"]="3.19" ["41"] = "4.0")
64 if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then
65 OKV=${OKV_DICT["${KV_MAJOR}"]}
66 + if [[ ${KV_MAJOR} -ge 4 ]] && [[ ${KV_PATCH_ARR} -ge 1 ]]; then
67 + OKV=${OKV_DICT["${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"]}
68 + else
69 + OKV=${OKV_DICT["${KV_MAJOR}"]}
70 + fi
71 KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz
72 ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz"
73 UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz"