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 ++++++++++++++++----------
 testing/scripts/function.sh               |  2 +-
 testing/scripts/recipes/013_strongswan.mk |  3 +++
 3 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'testing/scripts')

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
diff --git a/testing/scripts/function.sh b/testing/scripts/function.sh
index 2dd465c85..bab2f7422 100755
--- a/testing/scripts/function.sh
+++ b/testing/scripts/function.sh
@@ -163,7 +163,7 @@ running_any()
 	command -v virsh >/dev/null || return 1
 	for host in $*
 	do
-		virsh list --name | grep "^$host$" >/dev/null && return 0
+		virsh list --name 2>/dev/null | grep "^$host$" >/dev/null && return 0
 	done
 	return 1
 }
diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk
index d58de95bf..404c6c6bf 100644
--- a/testing/scripts/recipes/013_strongswan.mk
+++ b/testing/scripts/recipes/013_strongswan.mk
@@ -54,6 +54,8 @@ CONFIG_OPTS = \
 	--enable-imv-attestation \
 	--enable-imc-swid \
 	--enable-imv-swid \
+	--enable-imc-hcd \
+	--enable-imv-hcd \
 	--enable-sql \
 	--enable-sqlite \
 	--enable-attr-sql \
@@ -77,6 +79,7 @@ CONFIG_OPTS = \
 	--enable-ccm \
 	--enable-gcm \
 	--enable-cmac \
+	--enable-chapoly \
 	--enable-ha \
 	--enable-af-alg \
 	--enable-whitelist \
-- 
cgit v1.2.3