diff options
Diffstat (limited to 'patches/vswitchperf')
| -rw-r--r-- | patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch | 6 | ||||
| -rw-r--r-- | patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch | 12 |
2 files changed, 9 insertions, 9 deletions
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 index 29e8a1d3..0fd972cc 100644 --- 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 @@ -10,7 +10,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/build-vsperf.sh b/ci/build-vsperf.sh -index 5370898..fc38747 100755 +index a02de00..fa0d46a 100755 --- a/ci/build-vsperf.sh +++ b/ci/build-vsperf.sh @@ -87,14 +87,15 @@ TEST_REPORT_LOG_DIR="${HOME}/opnfv/$PROJECT/results/$BRANCH" @@ -22,7 +22,7 @@ index 5370898..fc38747 100755 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 @@ -31,4 +31,4 @@ index 5370898..fc38747 100755 + 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 index 0a92144f..f82aaae7 100644 --- 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 @@ -10,21 +10,21 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 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 +index 1b42a79..b0f3740 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 +@@ -54,11 +54,12 @@ apt-get -y install libnuma-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 - - + + |