From 5dca9ea0e2931f0e2a056c7964d311bcc30a01b8 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@debian.org>
Date: Thu, 22 Oct 2015 11:43:58 +0200
Subject: Imported Upstream version 5.3.3

---
 testing/scripts/build-guestkernel | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'testing/scripts/build-guestkernel')

diff --git a/testing/scripts/build-guestkernel b/testing/scripts/build-guestkernel
index 17f22bd83..a10fb83d2 100755
--- a/testing/scripts/build-guestkernel
+++ b/testing/scripts/build-guestkernel
@@ -26,21 +26,27 @@ then
 	execute "wget -q $url"
 fi
 
-log_action "Unpacking kernel"
-execute "tar xJf $KERNELTARBALL"
-
 KERNELDIR=$BUILDDIR/$KERNEL
-cd $KERNELDIR
 
-if [ $KERNELPATCH ]
+if [ ! -d "$KERNELDIR" ]
 then
-	log_action "Applying kernel patch"
-	bzcat ../$KERNELPATCH | patch -p1 >>$LOGFILE 2>&1
-	log_status $?
-	[ $? -eq 0 ] || exit 1
+	log_action "Unpacking kernel"
+	execute "tar xJf $KERNELTARBALL"
+
+	if [ $KERNELPATCH ]
+	then
+		log_action "Applying kernel patch"
+		bzcat $KERNELPATCH | patch -d $KERNELDIR -p1 >>$LOGFILE 2>&1
+		log_status $?
+		[ $? -eq 0 ] || exit 1
+	fi
 fi
+cd $KERNELDIR
 
-execute "cp $KERNELCONFIG .config" 0
+if [ ! -f .config ]
+then
+	execute "cp $KERNELCONFIG .config" 0
+fi
 
 echo "Creating kernel configuration, you might get prompted for new parameters"
 make oldconfig 2>&1 | tee -a $LOGFILE
-- 
cgit v1.2.3