From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 7 May 2019 17:21:21 +0000 (+0200)
Subject: testing: Build certificates before guests after building strongSwan
X-Git-Tag: 5.8.0rc1~5^2~1
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fstrongswan.git;a=commitdiff_plain;h=d3f678c08f52549fe0eece1c3cf37838c7901834

testing: Build certificates before guests after building strongSwan

If the script is run on a clean working copy, building the guests will
fail if the certificates don't exist.
---

diff --git a/testing/scripts/build-strongswan b/testing/scripts/build-strongswan
index 2214a57d14..d872e72854 100755
--- a/testing/scripts/build-strongswan
+++ b/testing/scripts/build-strongswan
@@ -88,9 +88,15 @@ cp $RECPDIR/$RECIPE $SHAREDDIR/build-strongswan
 log_action "Installing from recipe $RECIPE"
 execute_chroot "make SRCDIR=/root/strongswan BUILDDIR=/root/shared/build-strongswan -f /root/shared/build-strongswan/$RECIPE"
 
-# requild the guest images if we modified the root image
+# rebuild the guest images after we modified the root image
 if [ -z "$2" ]; then
 	# cleanup before mounting guest images
 	on_exit
-	$DIR/build-guestimages
+	# building the guest images without certificates fails on winnetou
+	if [ ! -f "$DIR/../hosts/winnetou/etc/ca/strongswanCert.pem" ]; then
+		# this also re-builds the guest images
+		$DIR/build-certs
+	else
+		$DIR/build-guestimages
+	fi
 fi