From: Alexandru Avadanii Date: Mon, 19 Dec 2016 20:45:17 +0000 (+0100) Subject: build: plugins: Allow plugin env var override X-Git-Tag: danube.1.RC1~65 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8924cccfdc5b6df94dfb3bb4a97ec66a63d0a7fb;p=fuel.git build: plugins: Allow plugin env var override Newton uplift [1] silently disabled env var overrides for the PLUGINS var, breaking Armband plugin selection. Proposed fix: only set this var when not already set. [1] https://gerrit.opnfv.org/gerrit/#/c/23433/ JIRA: ARMBAND-118 Change-Id: I143fc79de26cc9a3b66a177ca905984989bf4a9d Signed-off-by: Alexandru Avadanii --- diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index a011000a3..22a99ab10 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,7 +11,7 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have # verified it! -PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild +PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild export PLUGINS NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild