summaryrefslogtreecommitdiff
path: root/testing/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'testing/scripts')
-rwxr-xr-xtesting/scripts/build-baseimage4
-rwxr-xr-xtesting/scripts/build-guestkernel2
-rw-r--r--testing/scripts/recipes/005_anet.mk2
-rw-r--r--testing/scripts/recipes/006_tkm-rpc.mk2
-rw-r--r--testing/scripts/recipes/010_tkm.mk2
-rw-r--r--testing/scripts/recipes/012_openssl.mk2
6 files changed, 7 insertions, 7 deletions
diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index c927934f1..d9500cb35 100755
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -16,9 +16,9 @@ INC=automake,autoconf,libtool,bison,flex,gperf,pkg-config,gettext
INC=$INC,build-essential,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,ethtool
INC=$INC,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc
INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev
-INC=$INC,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core
+INC=$INC,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core,iperf
INC=$INC,less,acpid,acpi-support-base,libldns-dev,libunbound-dev,dnsutils,screen
-INC=$INC,gnat,gprbuild,libahven3-dev,libxmlada4.1-dev,libgmpada3-dev
+INC=$INC,gnat,gprbuild,libahven3-dev,libxmlada4.1-dev,libgmpada3-dev,htop
INC=$INC,libalog0.4.1-base-dev,hostapd,libsoup2.4-dev,ca-certificates,unzip
INC=$INC,python,python-setuptools,python-dev,python-pip
INC=$INC,libjson0-dev,libxslt1-dev,libapache2-mod-wsgi,iptables-dev
diff --git a/testing/scripts/build-guestkernel b/testing/scripts/build-guestkernel
index 40aa1b4f1..17f22bd83 100755
--- a/testing/scripts/build-guestkernel
+++ b/testing/scripts/build-guestkernel
@@ -14,7 +14,7 @@ cd $BUILDDIR
if [ ! -f "$KERNELTARBALL" ]
then
- url=ftp://ftp.kernel.org/pub/linux/kernel/v3.x/$KERNELTARBALL
+ url=ftp://ftp.kernel.org/pub/linux/kernel/v${KERNELVERSION:0:1}.x/$KERNELTARBALL
log_action "Downloading $url"
execute "wget -q $url"
fi
diff --git a/testing/scripts/recipes/005_anet.mk b/testing/scripts/recipes/005_anet.mk
index 2d982d091..b02d63094 100644
--- a/testing/scripts/recipes/005_anet.mk
+++ b/testing/scripts/recipes/005_anet.mk
@@ -2,7 +2,7 @@
PKG = anet
SRC = http://git.codelabs.ch/git/$(PKG).git
-REV = v0.2.2
+REV = v0.3.1
PREFIX = /usr/local/ada
diff --git a/testing/scripts/recipes/006_tkm-rpc.mk b/testing/scripts/recipes/006_tkm-rpc.mk
index 6c4aae0c5..5c98123d6 100644
--- a/testing/scripts/recipes/006_tkm-rpc.mk
+++ b/testing/scripts/recipes/006_tkm-rpc.mk
@@ -2,7 +2,7 @@
PKG = tkm-rpc
SRC = http://git.codelabs.ch/git/$(PKG).git
-REV = v0.1
+REV = v0.2
PREFIX = /usr/local/ada
diff --git a/testing/scripts/recipes/010_tkm.mk b/testing/scripts/recipes/010_tkm.mk
index 12eafd6c8..5abd2178b 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.1
+REV = v0.1.2
export ADA_PROJECT_PATH=/usr/local/ada/lib/gnat
diff --git a/testing/scripts/recipes/012_openssl.mk b/testing/scripts/recipes/012_openssl.mk
index 9312445ce..16aec239d 100644
--- a/testing/scripts/recipes/012_openssl.mk
+++ b/testing/scripts/recipes/012_openssl.mk
@@ -7,7 +7,7 @@ SRC = http://download.strongswan.org/testing/openssl-fips/
all: install
$(PKG):
- wget -r $(SRC) --no-directories --directory-prefix $(PKG) --accept deb
+ wget -r $(SRC) --no-directories --directory-prefix $(PKG) --accept deb --no-parent
install: $(PKG)
cd $(PKG) && dpkg -i *.deb