From fde42c15fdc0f8334bc5f252befbf2c83c739c51 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Wed, 15 Jan 2014 02:14:08 +0100 Subject: [PATCH] Starting with 3.1.7 kernel.org replaced bz2 with xz format --- testing/scripts/build-guestkernel | 2 +- testing/testing.conf | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/testing/scripts/build-guestkernel b/testing/scripts/build-guestkernel index 66a9fe7a4b..40aa1b4f1e 100755 --- a/testing/scripts/build-guestkernel +++ b/testing/scripts/build-guestkernel @@ -27,7 +27,7 @@ then fi log_action "Unpacking kernel" -execute "tar xjf $KERNELTARBALL" +execute "tar xJf $KERNELTARBALL" KERNELDIR=$BUILDDIR/$KERNEL cd $KERNELDIR diff --git a/testing/testing.conf b/testing/testing.conf index 21055b85a6..2cbef96816 100644 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -24,14 +24,14 @@ fi : ${TESTDIR=/srv/strongswan-testing} # Kernel configuration -: ${KERNELVERSION=3.11.6} +: ${KERNELVERSION=3.12.7} : ${KERNEL=linux-$KERNELVERSION} -: ${KERNELTARBALL=$KERNEL.tar.bz2} -: ${KERNELCONFIG=$DIR/../config/kernel/config-3.11} +: ${KERNELTARBALL=$KERNEL.tar.xz} +: ${KERNELCONFIG=$DIR/../config/kernel/config-3.12} : ${KERNELPATCH=ha-3.11-abicompat.patch.bz2} # strongSwan version used in tests -: ${SWANVERSION=5.1.1} +: ${SWANVERSION=5.1.2} # Build directory where the guest kernel and images will be built : ${BUILDDIR=$TESTDIR/build} -- 2.47.2