From 633c6317dfc5b11ca337c537bc707776e0dc7846 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 26 Dec 2011 19:20:30 +0100
Subject: [PATCH] dump failure

---
 eclass/nas-kernel.eclass | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/eclass/nas-kernel.eclass b/eclass/nas-kernel.eclass
index 1e332e7..17c8245 100644
--- a/eclass/nas-kernel.eclass
+++ b/eclass/nas-kernel.eclass
@@ -382,18 +382,22 @@ nas-kernel_src_unpack() {
 
 	# unpack x-loader if required
 	if [ -n "${K_NASKERNEL_XLOADER_VER}" ]; then
+	pushd ${WORKDIR}
 		unpack x-loader-${K_NASKERNEL_XLOADER_VER}.orig.tar.gz
 		if [ -n "${K_NASKERNEL_XLOADER_PATCHES_VER}" ]; then
 			unpack x-loader-patches-${K_NASKERNEL_XLOADER_VER}-${K_NASKERNEL_XLOADER_PATCHES_VER}.tar.bz2
 		fi
+	popd
 	fi
 
 	# unpack u-boot if required
 	if [ -n "${K_NASKERNEL_UBOOT_VER}" ]; then
+	pushd ${WORKDIR}
 		unpack u-boot-${K_NASKERNEL_UBOOT_VER}.tar.bz2
 		if [ -n "${K_NASKERNEL_UBOOT_PATCHES_VER}" ]; then
 			unpack u-boot-patches-${K_NASKERNEL_UBOOT_VER}-${K_NASKERNEL_UBOOT_PATCHES_VER}.tar.bz2
 		fi
+	popd
 	fi
 }
 
@@ -451,17 +455,10 @@ _kernel_src_compile() {
 	# needed anyway, even if grub use flag is not used here
 	mkdir -p "${WORKDIR}"/boot
 
-	einfo "Starting to compile kernel..."
-	_kernel_copy_config "${WORKDIR}"/config
-
-	# do some cleanup
-	rm -rf "${WORKDIR}"/lib
-	rm -rf "${WORKDIR}"/cache
-	rm -rf "${S}"/temp
-
 	# compile x-loader if required
 	if [ -n "${K_NASKERNEL_XLOADER_VER}" ]; then
-	pushd "${WORKDIR}/x-loader-${K_NASKERNEL_XLOADER_VER}"
+	einfo "Starting to compile X Loader..."
+		pushd "${WORKDIR}/x-loader-${K_NASKERNEL_XLOADER_VER}"
 		if [ -n "${K_NASKERNEL_XLOADER_PATCHES_VER}" ]; then
 			EPATCH_SOURCE="${WORKDIR}/x-loader-patches" EPATCH_SUFFIX="patch" \
 			EPATCH_FORCE="yes" epatch
@@ -475,12 +472,13 @@ _kernel_src_compile() {
 			emake ${K_NASKERNEL_XLOADER_TARGET}
 			emake
 		fi
-	popd
+		popd
 	fi
 
 	# compile u-boot if required
 	if [ -n "${K_NASKERNEL_UBOOT_VER}" ]; then
-	pushd "${WORKDIR}/u-boot-${K_NASKERNEL_UBOOT_VER}"
+	einfo "Starting to compile U Boot..."
+		pushd "${WORKDIR}/u-boot-${K_NASKERNEL_UBOOT_VER}"
 		if [ -n "${K_KERNEL_UBOOT_PATCHES_VER}" ]; then
 			EPATCH_SOURCE="${WORKDIR}/u-boot-patches" EPATCH_SUFFIX="patch" \
 			EPATCH_FORCE="yes" epatch
@@ -494,9 +492,18 @@ _kernel_src_compile() {
 			emake ${K_NASKERNEL_UBOOT_TARGET}
 			emake
 		fi
-	popd
+		popd
 	fi
 
+	einfo "Starting to compile kernel..."
+	_kernel_copy_config "${WORKDIR}"/config
+
+	# do some cleanup
+	rm -rf "${WORKDIR}"/lib
+	rm -rf "${WORKDIR}"/cache
+	rm -rf "${S}"/temp
+
+
 	cd "${S}" || die
 	GKARGS="--no-save-config --disklabel"
 	use dracut && GKARGS="${GKARGS} --dracut"