From a0805a01542505301918cacb5db6216814c40023 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 28 Jun 2017 20:48:38 +0200 Subject: MCP: Remove all Fuel patches and plugins Chances are none of the old patches / plugins can be reused as-is, so remove all of them and prepare for the switch to MCP. Change-Id: I999927a43b438d9bda9ff118731e2af4b1fa8caa Signed-off-by: Alexandru Avadanii --- ...d-vsperf-make-qemu-system-name-arch-indep.patch | 42 ---------------------- ...-u-build_base_machine-Arch-indep-libdir-s.patch | 38 -------------------- 2 files changed, 80 deletions(-) delete mode 100644 patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch delete mode 100644 patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch (limited to 'patches/vswitchperf') 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 deleted file mode 100644 index 3d3785f1..00000000 --- a/patches/vswitchperf/0001-ci-build-vsperf-make-qemu-system-name-arch-indep.patch +++ /dev/null @@ -1,42 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -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 ---- - 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 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" - # 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 deleted file mode 100644 index 68ea8e8d..00000000 --- a/patches/vswitchperf/0002-s-u-build_base_machine-Arch-indep-libdir-s.patch +++ /dev/null @@ -1,38 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -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 ---- - 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 1b42a79..b0f3740 100755 ---- a/systems/ubuntu/build_base_machine.sh -+++ b/systems/ubuntu/build_base_machine.sh -@@ -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 - - -- cgit 1.2.3-korg