From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 28 Jun 2016 21:10:10 +0000 (+0200)
Subject: vswitchperf: Arch-indep build.
X-Git-Tag: colorado.1.rc1~356^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F16113%2F1;p=armband.git

vswitchperf: Arch-indep build.

FIXME: dpdk, ovs, qemu etc. building only supports x86 for now.

TODO: conf dir should be patched too.

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch b/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch
new file mode 100644
index 00000000..29e8a1d3
--- /dev/null
+++ b/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch
@@ -0,0 +1,34 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Tue, 28 Jun 2016 21:27:02 +0200
+Subject: [PATCH] ci/build-vsperf: make qemu-system name arch-indep.
+
+Instead of hardcoding x86_64 into qemu-system name, use `uname -m`.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ ci/build-vsperf.sh | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh
+index 5370898..fc38747 100755
+--- a/ci/build-vsperf.sh
++++ b/ci/build-vsperf.sh
+@@ -87,14 +87,15 @@ TEST_REPORT_LOG_DIR="${HOME}/opnfv/$PROJECT/results/$BRANCH"
+ # parameters:
+ #   none
+ function terminate_vsperf() {
++    local qemu_system_name="qemu-system-$(uname -m)"
+     sudo pkill stress &> /dev/null
+     sudo pkill python3 &> /dev/null
+-    sudo killall -9 qemu-system-x86_64 &> /dev/null
++    sudo killall -9 "${qemu_system_name}" &> /dev/null
+ 
+     # sometimes qemu resists to terminate, so wait a bit and kill it again
+-    if pgrep qemu-system-x86_64 &> /dev/null ; then
++    if pgrep "${qemu_system_name}" &> /dev/null ; then
+         sleep 5
+-        sudo killall -9 qemu-system-x86_64 &> /dev/null
++        sudo killall -9 "${qemu_system_name}" &> /dev/null
+         sleep 5
+     fi
+ 
diff --git a/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch b/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch
new file mode 100644
index 00000000..0a92144f
--- /dev/null
+++ b/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch
@@ -0,0 +1,30 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Tue, 28 Jun 2016 21:35:44 +0200
+Subject: [PATCH] s/u/build_base_machine: Arch indep libdir(s).
+
+The same fixes should be applied on arm64, for example.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ systems/ubuntu/build_base_machine.sh | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/systems/ubuntu/build_base_machine.sh b/systems/ubuntu/build_base_machine.sh
+index a2b48a2..7cbe78e 100755
+--- a/systems/ubuntu/build_base_machine.sh
++++ b/systems/ubuntu/build_base_machine.sh
+@@ -52,11 +52,12 @@ apt-get -y install libfuse-dev
+ # packages related to VM
+ 
+ # a few manual fix up on a ubuntu
+-cd /lib/x86_64-linux-gnu
++local arch=$(uname -m)
++cd /lib/${arch}-linux-gnu
+ ln -sf libssl.so.1.0.0 libssl.so
+ ln -sf libcrypto.so.1.0.0 libcrypto.so
+ 
+-cd /usr/lib/x86_64-linux-gnu
++cd /usr/lib/${arch}-linux-gnu
+ ln -sf libxml2.so.2 libxml2.so
+ 
+