summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-20 17:49:51 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-30 18:07:06 +0200
commit261046f7cc5dcf0ee7a9d1e4428b14f5227878c5 (patch)
tree74a0f07dc269c2cb874de4f90f46495eb14b493f
parent17a9c9e51be20ca84f9e9c4ad6f305449f239dfa (diff)
plugins: ovs, vswperf, yardstick: Allow overrides.
Allow git info related variables from various plugin config.mk configuration files to be overriden. We rely on this in Armband to apply our patches on top of selected commit(s), then pick up the new (patched) git info. Change-Id: Ib7d9a52f51cef27ec4031587a09a39732a9fbbb4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk6
-rw-r--r--build/f_isoroot/f_vsperfpluginbuild/config.mk6
-rw-r--r--build/f_isoroot/f_yardstick-pluginbuild/config.mk6
3 files changed, 9 insertions, 9 deletions
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
index 596635145..4dc65fede 100644
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
@@ -7,6 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-OVS_NSH_DPDK_BRANCH=6f5f62221049d130ad190030a36db3147d6deb10
-OVS_NSH_DPDK_REPO=https://review.openstack.org/openstack/fuel-plugin-ovs
-OVS_NSH_DPDK_CHANGE=
+OVS_NSH_DPDK_BRANCH?=6f5f62221049d130ad190030a36db3147d6deb10
+OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs
+OVS_NSH_DPDK_CHANGE?=
diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
index 1bf1ef0b5..576018dcf 100644
--- a/build/f_isoroot/f_vsperfpluginbuild/config.mk
+++ b/build/f_isoroot/f_vsperfpluginbuild/config.mk
@@ -7,6 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-VSPERF_BRANCH=5e3b6ae0427963520357453728411327ac8efafe
-VSPERF_REPO=https://gerrit.opnfv.org/gerrit/vswitchperf.git
-VSPERF_CHANGE=
+VSPERF_BRANCH?=5e3b6ae0427963520357453728411327ac8efafe
+VSPERF_REPO?=https://gerrit.opnfv.org/gerrit/vswitchperf.git
+VSPERF_CHANGE?=
diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
index 36df8f1ba..f671aa997 100644
--- a/build/f_isoroot/f_yardstick-pluginbuild/config.mk
+++ b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
@@ -8,6 +8,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-YARDSTICK_BRANCH=675eef731a098f83aa98c2021b151b7e5ba1da7d
-YARDSTICK_REPO=https://gerrit.opnfv.org/gerrit/yardstick.git
-YARDSTICK_CHANGE=
+YARDSTICK_BRANCH?=675eef731a098f83aa98c2021b151b7e5ba1da7d
+YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git
+YARDSTICK_CHANGE?=