From 629f39b6928c3cb36d25dc07347de47d601e847e Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 22 Aug 2016 14:49:10 +0200 Subject: submodule: Kill yardstick Since arm64 support has been proposed straight upstream [1], we no longer have to keep the git submodule for the yarstick repo. [1] https://gerrit.opnfv.org/gerrit/#/c/18883/ Change-Id: Ic8a02106ed1d26012a0767fc0444b8f8d35c54aa Signed-off-by: Alexandru Avadanii --- .gitmodules | 4 ---- patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch | 6 +----- upstream/yardstick | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 160000 upstream/yardstick diff --git a/.gitmodules b/.gitmodules index 5b1bd073..1fffefb1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,10 +34,6 @@ path = upstream/vswitchperf url = https://gerrit.opnfv.org/gerrit/vswitchperf.git branch = master -[submodule "yardstick"] - path = upstream/yardstick - url = https://gerrit.opnfv.org/gerrit/yardstick.git - branch = master [submodule "fuel-astute"] path = upstream/fuel-astute url = https://github.com/openstack/fuel-astute.git diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch index 4a312580..31446652 100644 --- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch +++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch @@ -51,7 +51,7 @@ new file mode 100644 index 0000000..1e772f0 --- /dev/null +++ b/build/armband.mk -@@ -0,0 +1,53 @@ +@@ -0,0 +1,49 @@ +############################################################################## +# Copyright (c) 2016 Enea AB and others. +# Alexandru.Avadanii@enea.com @@ -100,10 +100,6 @@ index 0000000..1e772f0 + export VSPERF_REPO := ${ARMBAND_BASE}/upstream/vswitchperf + export VSPERF_BRANCH := armband-workbench + export VSPERF_CHANGE := HEAD -+ -+ export YARDSTICK_REPO := ${ARMBAND_BASE}/upstream/yardstick -+ export YARDSTICK_BRANCH := armband-workbench -+ export YARDSTICK_CHANGE := HEAD +endif diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index b38ea4c..624f233 100644 diff --git a/upstream/yardstick b/upstream/yardstick deleted file mode 160000 index 27e254c2..00000000 --- a/upstream/yardstick +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 27e254c2273e4be503053db882948b8abf53b269 -- cgit 1.2.3-korg