diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2012-03-17 00:01:59 +0000 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2012-03-17 00:01:59 +0000 |
| commit | c3e08af50a8108b872a776ec6508ab4c13a0cfea (patch) | |
| tree | fe92ca4eb7a137dba9ef0b93186a7813d2229e92 | |
| parent | version bump and clean up (diff) | |
| download | gentoo-2-c3e08af50a8108b872a776ec6508ab4c13a0cfea.tar.gz gentoo-2-c3e08af50a8108b872a776ec6508ab4c13a0cfea.tar.bz2 gentoo-2-c3e08af50a8108b872a776ec6508ab4c13a0cfea.zip | |
Fix eclass for rc kernels, and fix testing tarball download location. bug #407869
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/kernel-2.eclass | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0c0d0a76f8a9..af1c1787079e 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.169 2012/03/15 16:51:54 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.170 2012/03/17 00:01:59 mpagano Exp $ + + 17 Mar 2012; Michael Pagano <mpagano@gentoo.org> kernel-2.eclass: + Fix eclass for rc kernels, and fix testing tarball download location. bug + #407869 15 Mar 2012; Patrick Lauer <patrick@gentoo.org> distutils.eclass: Fixing #407495 diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 7c955870240b..c4811ae38968 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.274 2011/12/28 13:38:05 psomas Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.275 2012/03/17 00:01:59 mpagano Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -207,14 +207,10 @@ detect_version() { if [[ ${#OKV_ARRAY[@]} -lt 3 ]]; then KV_PATCH_ARR=(${KV_PATCH//\./ }) - # at this point 080811, Linus is putting 3.1 kernels in 3.0 directory - # revisit when 3.1 is released - if [[ ${KV_PATCH} -gt 0 ]]; then - KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" - else - KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_PATCH_ARR}" - fi - # KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_PATCH_ARR}" + # at this point 031412, Linus is putting all 3.x kernels in a + # 3.x directory, may need to revisit when 4.x is released + KERNEL_BASE_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.x" + [[ -n "${K_LONGTERM}" ]] && KERNEL_BASE_URI="${KERNEL_BASE_URI}/longterm/v${KV_MAJOR}.${KV_PATCH_ARR}" else @@ -346,7 +342,7 @@ detect_version() { OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" fi KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2 - ${KERNEL_BASE_URI}/testing/linux-${OKV}.tar.bz2" + ${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2" UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2" fi |