diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2014-03-11 20:48:48 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2014-03-11 20:48:48 +0100 |
| commit | 15fb7904f4431a6e7c305fd08732458f7f885e7e (patch) | |
| tree | c93b60ee813af70509f00f34e29ebec311762427 /testing/scripts | |
| parent | 5313d2d78ca150515f7f5eb39801c100690b6b29 (diff) | |
| download | vyos-strongswan-15fb7904f4431a6e7c305fd08732458f7f885e7e.tar.gz vyos-strongswan-15fb7904f4431a6e7c305fd08732458f7f885e7e.zip | |
Imported Upstream version 5.1.2
Diffstat (limited to 'testing/scripts')
| -rwxr-xr-x | testing/scripts/build-baseimage | 2 | ||||
| -rwxr-xr-x | testing/scripts/build-guestkernel | 2 | ||||
| -rw-r--r-- | testing/scripts/recipes/003_freeradius.mk | 2 | ||||
| -rw-r--r-- | testing/scripts/recipes/010_tkm.mk | 2 | ||||
| -rw-r--r-- | testing/scripts/recipes/013_strongswan.mk | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage index 354b48bd7..b6b8854ab 100755 --- a/testing/scripts/build-baseimage +++ b/testing/scripts/build-baseimage @@ -68,7 +68,7 @@ do_on_exit graceful_umount $APTCACHE log_action "Running debootstrap ($BASEIMGSUITE, $BASEIMGARCH)" execute "debootstrap --arch=$BASEIMGARCH --include=$INC $BASEIMGSUITE $LOOPDIR $BASEIMGMIRROR" -execute "mount -t proc none $LOOPDIR/proc" +execute "mount -t proc none $LOOPDIR/proc" 0 do_on_exit graceful_umount $LOOPDIR/proc for service in $SERVICES diff --git a/testing/scripts/build-guestkernel b/testing/scripts/build-guestkernel index 66a9fe7a4..40aa1b4f1 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/scripts/recipes/003_freeradius.mk b/testing/scripts/recipes/003_freeradius.mk index 631c8b68a..05ed8b38c 100644 --- a/testing/scripts/recipes/003_freeradius.mk +++ b/testing/scripts/recipes/003_freeradius.mk @@ -3,7 +3,7 @@ PV = 2.2.1 PKG = freeradius-server-$(PV) TAR = $(PKG).tar.bz2 -SRC = ftp://ftp.freeradius.org/pub/freeradius/$(TAR) +SRC = ftp://ftp.freeradius.org/pub/freeradius/old/$(TAR) NUM_CPUS := $(shell getconf _NPROCESSORS_ONLN) diff --git a/testing/scripts/recipes/010_tkm.mk b/testing/scripts/recipes/010_tkm.mk index cf24e1e26..960eba79f 100644 --- a/testing/scripts/recipes/010_tkm.mk +++ b/testing/scripts/recipes/010_tkm.mk @@ -2,7 +2,7 @@ PKG = tkm SRC = http://git.codelabs.ch/git/$(PKG).git -REV = v0.1 +REV = v0.1.1 export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat diff --git a/testing/scripts/recipes/013_strongswan.mk b/testing/scripts/recipes/013_strongswan.mk index 85f80fe5b..438e6668a 100644 --- a/testing/scripts/recipes/013_strongswan.mk +++ b/testing/scripts/recipes/013_strongswan.mk @@ -79,7 +79,9 @@ CONFIG_OPTS = \ --enable-cmd \ --enable-libipsec \ --enable-kernel-libipsec \ - --enable-tkm + --enable-tkm \ + --enable-ntru \ + --enable-lookip export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat |