aboutsummaryrefslogtreecommitdiffstats
path: root/resources/tools/disk-image-builder/ubuntu
diff options
context:
space:
mode:
authorMatej Klotton <mklotton@cisco.com>2017-02-17 13:18:43 +0100
committerMatej Klotton <mklotton@cisco.com>2017-02-23 09:40:46 +0100
commit8c465631f6029b174e6d2549e1305b5b4cb8b8de (patch)
tree6cee8cc79889c361dd006c24416a8abf492d2053 /resources/tools/disk-image-builder/ubuntu
parentc5b285aebcfc93dcccf3285abbde672cf000e3cc (diff)
QemuUtil lib change to work with ubuntu and centos
- replace nc to socat for comunicating with qemu QGA - change disk type to use virtio driver - add check to bind only network interface for testpmd Change-Id: I19ab16cbd8fec1ec78263ccfb1309a144e5af845 Signed-off-by: Matej Klotton <mklotton@cisco.com>
Diffstat (limited to 'resources/tools/disk-image-builder/ubuntu')
-rw-r--r--resources/tools/disk-image-builder/ubuntu/CHANGELOG4
-rwxr-xr-xresources/tools/disk-image-builder/ubuntu/run-listmaker.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/resources/tools/disk-image-builder/ubuntu/CHANGELOG b/resources/tools/disk-image-builder/ubuntu/CHANGELOG
index 6b904ddf2f..01ab988664 100644
--- a/resources/tools/disk-image-builder/ubuntu/CHANGELOG
+++ b/resources/tools/disk-image-builder/ubuntu/CHANGELOG
@@ -1,3 +1,7 @@
+## [1.7] - 2017-02-20
+
+Added socat as vm testing dependency.
+
## [1.6] - 2016-12-19
Add cmake
diff --git a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
index 3b0a2e0123..acc1447976 100755
--- a/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
+++ b/resources/tools/disk-image-builder/ubuntu/run-listmaker.sh
@@ -66,7 +66,7 @@ APT_WANTLIST_CSIT="python-dev python-pip python-virtualenv git strongswan"
APT_WANTLIST_TLDK="libpcap0.8-dev libpcap-dev cmake"
APT_WANTLIST_VPP="dkms bridge-utils"
APT_WANTLIST_TREX="zlib1g-dev unzip"
-APT_WANTLIST_NESTED="qemu-system-x86"
+APT_WANTLIST_NESTED="socat qemu-system-x86"
APT_WANTLIST_JAVA="openjdk-8-jdk-headless"
#Docker is currently disabled due to issues with apt repositories retrieval
#APT_WANTLIST_DOCKER="docker-engine"