From f7d3fda1964adc3700740ff4e975d428ce838f06 Mon Sep 17 00:00:00 2001 From: Mike Pagano Date: Tue, 8 Nov 2011 01:05:22 +0000 Subject: [PATCH] Modify to support new location of 2.6 kernels on kernel.org and mirrors --- eclass/ChangeLog | 5 ++++- eclass/kernel-2.eclass | 12 +++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 4829e4456653..05deaee66efd 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.2 2011/11/04 13:08:23 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.3 2011/11/08 01:05:22 mpagano Exp $ + + 08 Nov 2011; Michael Pagano kernel-2.eclass: + Modify to support new location of 2.6 kernels on kernel.org and mirrors 04 Nov 2011; Naohiro Aota mysql.eclass, user.eclass: Change possible mis-used ${action} to ${db} diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index cc3518249585..61c1b466379d 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.261 2011/10/24 23:58:11 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.262 2011/11/08 01:05:22 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -232,9 +232,15 @@ detect_version() { else #KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.0" #KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}" - KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x" + if [[ ${KV_MAJOR} -ge 3 ]]; then + KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x" + else + KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}" + fi + [[ -n "${K_LONGTERM}" ]] && - KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" + KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm" + #KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}" fi debug-print "KERNEL_BASE_URI is ${KERNEL_BASE_URI}" -- 2.26.2