From b67973602562b98188d9db8b5af9c614d2cbac6e Mon Sep 17 00:00:00 2001 From: Mike Pagano Date: Mon, 27 Apr 2015 18:59:42 +0000 Subject: [PATCH] Handle 4.1 base kernel. See bug #547894. --- eclass/ChangeLog | 5 ++++- eclass/kernel-2.eclass | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c7a3cb25ae6e..9e712c076742 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 kernel-2.eclass: + Handle 4.1 base kernel. See bug #547894. 25 Apr 2015; Lars Wendler mozconfig-v5.36.eclass: Adjusted libvpx dependency. diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index f7738658e251..7901a29d829a 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -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 @@ detect_version() { 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" -- 2.26.2