diff options
Diffstat (limited to 'eclass/kernel-2.eclass')
-rw-r--r-- | eclass/kernel-2.eclass | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 8ebee41155b2..bc09a4e4f4e7 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.278 2013/03/05 19:52:08 mpagano Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.279 2013/03/09 21:05:50 tomwij Exp $ # Description: kernel.eclass rewrite for a clean base regarding the 2.6 # series of kernel with back-compatibility for 2.4 @@ -121,18 +121,18 @@ handle_genpatches() { # for > 3.0 kernels, handle genpatches tarball name # genpatches for 3.0 and 3.0.1 might be named - # genpatches-3.0-1.base.tar.bz2 and genpatches-3.0-2.base.tar.bz2 + # genpatches-3.0-1.base.tar.xz and genpatches-3.0-2.base.tar.xz # respectively. Handle this. for i in ${K_WANT_GENPATCHES} ; do if [[ ${KV_MAJOR} -ge 3 ]]; then if [[ ${#OKV_ARRAY[@]} -ge 3 ]]; then - tarball="genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.bz2" + tarball="genpatches-${KV_MAJOR}.${KV_MINOR}-${K_GENPATCHES_VER}.${i}.tar.xz" else - tarball="genpatches-${KV_MAJOR}.${KV_PATCH}-${K_GENPATCHES_VER}.${i}.tar.bz2" + tarball="genpatches-${KV_MAJOR}.${KV_PATCH}-${K_GENPATCHES_VER}.${i}.tar.xz" fi else - tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.bz2" + tarball="genpatches-${OKV}-${K_GENPATCHES_VER}.${i}.tar.xz" fi debug-print "genpatches tarball: $tarball" GENPATCHES_URI="${GENPATCHES_URI} mirror://gentoo/${tarball}" @@ -232,12 +232,12 @@ detect_version() { if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then # handle non genpatch using sources correctly if [[ -z ${K_WANT_GENPATCHES} && -z ${K_GENPATCHES_VER} && ${KV_PATCH} -gt 0 ]]; then - KERNEL_URI="${KERNEL_BASE_URI}/patch-${OKV}.bz2" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2" + KERNEL_URI="${KERNEL_BASE_URI}/patch-${OKV}.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.xz" fi - KERNEL_URI="${KERNEL_URI} ${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.bz2" + KERNEL_URI="${KERNEL_URI} ${KERNEL_BASE_URI}/linux-${KV_MAJOR}.${KV_MINOR}.tar.xz" else - KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2" + KERNEL_URI="${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" fi RELEASE=${CKV/${OKV}} @@ -291,9 +291,9 @@ detect_version() { else OKV="${KV_MAJOR}.${KV_PATCH}" fi - KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.bz2 - ${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.bz2" + KERNEL_URI="${KERNEL_BASE_URI}/patch-${CKV}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV}.xz" fi # We need to set this using OKV, but we need to set it before we do any @@ -308,30 +308,30 @@ detect_version() { # for example: # CKV="2.6.11_rc3_pre2" # will pull: - # linux-2.6.10.tar.bz2 & patch-2.6.11-rc3.bz2 & patch-2.6.11-rc3-git2.bz2 + # linux-2.6.10.tar.xz & patch-2.6.11-rc3.xz & patch-2.6.11-rc3-git2.xz if [[ ${KV_MAJOR}${KV_MINOR} -eq 26 ]]; then if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" - KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2 - ${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2" + KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz" fi if [[ ${RELEASETYPE} == -git ]]; then - KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2 - ${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2" + KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.xz" fi if [[ ${RELEASETYPE} == -rc-git ]]; then OKV="${KV_MAJOR}.${KV_MINOR}.$((${KV_PATCH} - 1))" - KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2 - ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 - ${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2" + KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.xz + ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${RELEASE}.bz2" + 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 if [[ ${RELEASETYPE} == -rc ]] || [[ ${RELEASETYPE} == -pre ]]; then @@ -341,15 +341,15 @@ detect_version() { KV_PATCH_ARR=(${KV_PATCH//\./ }) OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" fi - KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.bz2 - ${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.bz2" + KERNEL_URI="${KERNEL_BASE_URI}/testing/patch-${CKV//_/-}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${CKV//_/-}.xz" fi if [[ ${RELEASETYPE} == -git ]]; then - KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.bz2 - ${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.bz2" + KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${OKV}${RELEASE}.xz + ${KERNEL_BASE_URI}/linux-${OKV}.tar.xz" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${OKV}${RELEASE}.xz" fi if [[ ${RELEASETYPE} == -rc-git ]]; then @@ -359,11 +359,11 @@ detect_version() { KV_PATCH_ARR=(${KV_PATCH//\./ }) OKV="${KV_MAJOR}.$((${KV_PATCH_ARR} - 1))" fi - KERNEL_URI="${KERNEL_BASE_URI}/snapshots/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.bz2 - ${KERNEL_BASE_URI}/testing/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.bz2 - ${KERNEL_BASE_URI}/linux-${OKV}.tar.bz2" + 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" - UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.bz2 ${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.bz2" + UNIPATCH_LIST_DEFAULT="${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE/-git*}.xz ${DISTDIR}/patch-${KV_MAJOR}.${KV_PATCH}${RELEASE}.xz" fi @@ -551,9 +551,9 @@ universal_unpack() { cd "${WORKDIR}" if [[ ${#OKV_ARRAY[@]} -ge 3 ]] && [[ ${KV_MAJOR} -ge 3 ]]; then - unpack linux-${KV_MAJOR}.${KV_MINOR}.tar.bz2 + unpack linux-${KV_MAJOR}.${KV_MINOR}.tar.xz else - unpack linux-${OKV}.tar.bz2 + unpack linux-${OKV}.tar.xz fi if [[ -d "linux" ]]; then |