From 261046f7cc5dcf0ee7a9d1e4428b14f5227878c5 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 20 Jun 2016 17:49:51 +0200 Subject: 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 --- build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk | 6 +++--- build/f_isoroot/f_vsperfpluginbuild/config.mk | 6 +++--- build/f_isoroot/f_yardstick-pluginbuild/config.mk | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'build') 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?= -- cgit 1.2.3-korg