diff options
| author | Nick White <git@njw.me.uk> | 2009-08-03 16:38:47 +0100 |
|---|---|---|
| committer | Nick White <git@njw.me.uk> | 2009-08-03 16:38:47 +0100 |
| commit | b84424d660cc3453b8ac7e3379ab7d1109e64643 (patch) | |
| tree | 8675f0beb9d5a54f5bd917e0155ffd1b4b474170 | |
| parent | ec2f28e44312e7f8a9931bf38d69e699d4a1b1e6 (diff) | |
| download | njw-gentoo-local-b84424d660cc3453b8ac7e3379ab7d1109e64643.tar.bz2 njw-gentoo-local-b84424d660cc3453b8ac7e3379ab7d1109e64643.zip | |
Fixed kernel eclass
Fixed bug in kernel eclass - turns out relying on the gentoo kernel-2
eclass for version variables is a bad idea, so we'll do it ourselves.
| -rw-r--r-- | eclass/kernel-libre.eclass | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/eclass/kernel-libre.eclass b/eclass/kernel-libre.eclass index ebc009e..140850c 100644 --- a/eclass/kernel-libre.eclass +++ b/eclass/kernel-libre.eclass @@ -1,5 +1,5 @@ # -# Original Author: nick +# Original Author: Nick White # Purpose: override of kernel-2.eclass for the linux-libre kernel # @@ -10,17 +10,19 @@ KERNEL_URI="http://www.linux-libre.fsfla.org/pub/linux-libre/releases/${PV}-libr DEBLOB_CHECK="deblob-check" DEBLOB_URI="http://www.linux-libre.fsfla.org/pub/linux-libre/releases/${PV}-libre${LIBRE_VER}/${DEBLOB_CHECK}" +KERNEL_VER=${PV/-r*} + # rename deblob-check to avoid collisions if [[ $EAPI == 2 ]]; then - DEBLOB_CHECK="${DEBLOB_CHECK}-${OKV}" + DEBLOB_CHECK="${DEBLOB_CHECK}-${KERNEL_VER}" DEBLOB_URI="${DEBLOB_URI} -> ${DEBLOB_CHECK}" fi # override the kernel-2 function as tarball is named differently universal_unpack() { cd ${WORKDIR} - unpack linux-${OKV}-libre${LIBRE_VER}.tar.bz2 - mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV_FULL} \ + unpack linux-${KERNEL_VER}-libre${LIBRE_VER}.tar.bz2 + mv ${WORKDIR}/linux-${KERNEL_VER} ${WORKDIR}/linux-${KV_FULL} \ || die "Unable to move source tree to ${KV_FULL}." cd ${S} @@ -49,7 +51,7 @@ check_for_blobs() { } kernel-libre_src_unpack() { - # kernel revision patches included in tarball + # kernel revision patches are included in tarball UNIPATCH_LIST_DEFAULT="" if [ -n "${UNIPATCH_LIST_GENPATCHES}" ] || [ -n "${UNIPATCH_LIST}" ]; then |