mpagano 15/04/27 18:59:42 Modified: ChangeLog kernel-2.eclass Log: Handle 4.1 base kernel. See bug #547894.
Revision Changes Path 1.1595 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1595&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1595&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1594&r2=1.1595 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1594 retrieving revision 1.1595 diff -u -r1.1594 -r1.1595 --- ChangeLog 25 Apr 2015 09:13:40 -0000 1.1594 +++ ChangeLog 27 Apr 2015 18:59:42 -0000 1.1595 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1594 2015/04/25 09:13:40 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1595 2015/04/27 18:59:42 mpagano Exp $ + + 27 Apr 2015; Mike Pagano <[email protected]> kernel-2.eclass: + Handle 4.1 base kernel. See bug #547894. 25 Apr 2015; Lars Wendler <[email protected]> mozconfig-v5.36.eclass: Adjusted libvpx dependency. 1.302 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.302&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.302&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.301&r2=1.302 Index: kernel-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v retrieving revision 1.301 retrieving revision 1.302 diff -u -r1.301 -r1.302 --- kernel-2.eclass 20 Mar 2015 00:13:32 -0000 1.301 +++ kernel-2.eclass 27 Apr 2015 18:59:42 -0000 1.302 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.301 2015/03/20 00:13:32 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.302 2015/04/27 18:59:42 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -363,9 +363,14 @@ KV_PATCH_ARR=(${KV_PATCH//\./ }) # the different majorminor versions have different patch start versions - OKV_DICT=(["2"]="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" ["3"]="2.6.39" ["4"]="3.19") + OKV_DICT=(["2"]="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" ["3"]="2.6.39" ["4"]="3.19" ["41"] = "4.0") if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then OKV=${OKV_DICT["${KV_MAJOR}"]} + if [[ ${KV_MAJOR} -ge 4 ]] && [[ ${KV_PATCH_ARR} -ge 1 ]]; then + OKV=${OKV_DICT["${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))"]} + else + OKV=${OKV_DICT["${KV_MAJOR}"]} + fi KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz"
