mpagano 15/02/27 23:44:41 Modified: ChangeLog kernel-2.eclass Log: Cleanup how we determine base linux tarball.
Revision Changes Path 1.1557 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1557&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1557&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1556&r2=1.1557 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1556 retrieving revision 1.1557 diff -u -r1.1556 -r1.1557 --- ChangeLog 26 Feb 2015 20:41:10 -0000 1.1556 +++ ChangeLog 27 Feb 2015 23:44:41 -0000 1.1557 @@ -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.1556 2015/02/26 20:41:10 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1557 2015/02/27 23:44:41 mpagano Exp $ + + 27 Feb 2015; Mike Pagano <[email protected]> kernel-2.eclass: + Cleanup how we determine base linux tarball. 26 Feb 2015; Ian Stakenvicius (_AxS_) <[email protected]> mozconfig-v5.31.eclass, +mozconfig-v5.36.eclass: 1.300 eclass/kernel-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.300&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?rev=1.300&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kernel-2.eclass?r1=1.299&r2=1.300 Index: kernel-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- kernel-2.eclass 23 Feb 2015 12:42:40 -0000 1.299 +++ kernel-2.eclass 27 Feb 2015 23:44:41 -0000 1.300 @@ -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.299 2015/02/23 12:42:40 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.300 2015/02/27 23:44:41 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -371,15 +371,12 @@ UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz" fi else + 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") if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then - if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then - OKV="2.6.39" - elif [[ ${KV_MAJOR}${KV_PATCH} -eq 40 ]]; then - OKV="3.19" - else - KV_PATCH_ARR=(${KV_PATCH//\./ }) - OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" - fi + OKV=${OKV_DICT["${KV_MAJOR}"]} KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz" @@ -392,14 +389,7 @@ fi if [[ ${RELEASETYPE} == -rc-git ]]; then - if [[ ${KV_MAJOR}${KV_PATCH} -eq 30 ]]; then - OKV="2.6.39" - elif [[ ${KV_MAJOR}${KV_PATCH} -eq 40 ]]; then - OKV="2.19" - else - KV_PATCH_ARR=(${KV_PATCH//\./ }) - OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" - fi + OKV=${OKV_DICT["${KV_MAJOR}"]} KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" @@ -409,8 +399,7 @@ fi - - + debug-print-kernel2-variables handle_genpatches
