From efa86ad1a0d465f3e9b9ba01f7ca065bb58553a0 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 26 Dec 2011 19:09:30 +0100
Subject: [PATCH] add missing unpack

---
 eclass/nas-kernel.eclass | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/eclass/nas-kernel.eclass b/eclass/nas-kernel.eclass
index b7402f8..1e332e7 100644
--- a/eclass/nas-kernel.eclass
+++ b/eclass/nas-kernel.eclass
@@ -199,9 +199,9 @@ if [ -n "${K_NASKERNEL_XLOADER_VER}" ]; then
 	SRC_URI="${SRC_URI}
 		mirror://sablink/${CATEGORY}/linux-nas-patches/x-loader_${K_NASKERNEL_XLOADER_VER}.orig.tar.gz
 		https://launchpad.net/ubuntu/+archive/primary/+files/x-loader_${K_NASKERNEL_XLOADER_VER}.orig.tar.gz"
-	if [ -n "${K_KERNEL_XLOADER_PATCHES_VER}" ]; then
+	if [ -n "${K_NASKERNEL_XLOADER_PATCHES_VER}" ]; then
 		SRC_URI="${SRC_URI}
-			mirror://sablink/${CATEGORY}/linux-nas-patches/x-loader-patches-${K_NASKERNEL_XLOADER_VER}-${K_KERNEL_XLOADER_PATCHES_VER}.tar.bz2"
+			mirror://sablink/${CATEGORY}/linux-nas-patches/x-loader-patches-${K_NASKERNEL_XLOADER_VER}-${K_NASKERNEL_XLOADER_PATCHES_VER}.tar.bz2"
 	fi
 fi
 
@@ -210,9 +210,9 @@ if [ -n "${K_NASKERNEL_UBOOT_VER}" ]; then
 	SRC_URI="${SRC_URI}
 		mirror://sablink/${CATEGORY}/linux-nas-patches/u-boot-${K_NASKERNEL_UBOOT_VER}.tar.bz2
 		ftp://ftp.denx.de/pub/u-boot/u-boot-${K_NASKERNEL_UBOOT_VER}.tar.bz2"
-	if [ -n "${K_KERNEL_UBOOT_PATCHES_VER}" ]; then
+	if [ -n "${K_NASKERNEL_UBOOT_PATCHES_VER}" ]; then
 		SRC_URI="${SRC_URI}
-			mirror://sablink/${CATEGORY}/linux-nas-patches/u-boot-patches-${K_NASKERNEL_UBOOT_VER}-${K_KERNEL_UBOOT_PATCHES_VER}.tar.bz2"
+			mirror://sablink/${CATEGORY}/linux-nas-patches/u-boot-patches-${K_NASKERNEL_UBOOT_VER}-${K_NASKERNEL_UBOOT_PATCHES_VER}.tar.bz2"
 	fi
 fi
 
@@ -379,6 +379,22 @@ nas-kernel_src_unpack() {
 		sed -i "s/^EXTRAVERSION :=.*//" "${S}/Makefile" || die
 	fi
 	OKV="${okv}"
+
+	# unpack x-loader if required
+	if [ -n "${K_NASKERNEL_XLOADER_VER}" ]; then
+		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
+	fi
+
+	# unpack u-boot if required
+	if [ -n "${K_NASKERNEL_UBOOT_VER}" ]; then
+		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
+	fi
 }
 
 nas-kernel_src_compile() {
@@ -446,7 +462,7 @@ _kernel_src_compile() {
 	# compile x-loader if required
 	if [ -n "${K_NASKERNEL_XLOADER_VER}" ]; then
 	pushd "${WORKDIR}/x-loader-${K_NASKERNEL_XLOADER_VER}"
-		if [ -n "${K_KERNEL_XLOADER_PATCHES_VER}" ]; then
+		if [ -n "${K_NASKERNEL_XLOADER_PATCHES_VER}" ]; then
 			EPATCH_SOURCE="${WORKDIR}/x-loader-patches" EPATCH_SUFFIX="patch" \
 			EPATCH_FORCE="yes" epatch
 		fi