From 9bb440691c035cba24c9fd7c2c8f5ded64a4cafd Mon Sep 17 00:00:00 2001 From: Nick White Date: Tue, 16 Jun 2009 19:31:51 +0100 Subject: Don't touch distdir, use own unpack instead --- eclass/kernel-libre.eclass | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'eclass') diff --git a/eclass/kernel-libre.eclass b/eclass/kernel-libre.eclass index e04c36b..12f50cf 100644 --- a/eclass/kernel-libre.eclass +++ b/eclass/kernel-libre.eclass @@ -10,6 +10,18 @@ DEBLOB_CHECK="deblob-check" KERNEL_URI="http://www.linux-libre.fsfla.org/pub/linux-libre/releases/${PV}-libre/linux-${PV}-libre.tar.bz2" DEBLOB_URI="http://www.linux-libre.fsfla.org/pub/linux-libre/releases/${PV}-libre/${DEBLOB_CHECK}" +# override the kernel-2 function as tarball is named and laid out differently +universal_unpack() { + cd ${WORKDIR} + unpack linux-${OKV}-libre.tar.bz2 + mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV_FULL} \ + || die "Unable to move source tree to ${KV_FULL}." + cd ${S} + + # remove all backup files + find . -iname "*~" -exec rm {} \; 2> /dev/null +} + check_for_blobs() { # usage: check_for_blobs name_of_variable_containing_paths_to_check # we want the name of a variable (not just its contents) @@ -40,21 +52,5 @@ kernel-libre_src_unpack() { check_for_blobs "UNIPATCH_LIST" fi - # universal_unpack expects a different kernel tarball name - expected_tarball=${DISTDIR}/linux-${OKV}.tar.bz2 - - # temporarily move any preexisting kernel tarball - moved_tarball=${expected_tarball}-original - [[ -f $expected_tarball ]] && \ - mv $expected_tarball $moved_tarball - - ln -sf ${DISTDIR}/linux-${OKV}-libre.tar.bz2 $expected_tarball - kernel-2_src_unpack - - rm $expected_tarball - - # put any preexisting tarball back in its original location - [[ -f $moved_tarball ]] && \ - mv $moved_tarball $expected_tarball } -- cgit v1.2.3