diff options
| author |   Stefan Berg <stefan.k.berg@ericsson.com> | 2016-11-16 08:40:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-16 08:40:40 +0000 |
| commit | da5ed062277da74d394202a97ffa9344fe88ea2a (patch) | |
| tree | e71e707c1584e94f74925400dd59fcc87b5428ee /build/f_isoroot/Makefile | |
| parent | d4b0f79649da3ad7a3f3f59d3b92ea230f5b1826 (diff) | |
| parent | 9f8aff6636e0d86834178b461802f3e7cb95189d (diff) | |
Merge "Uplift to Fuel 10.0/Newton"
Diffstat (limited to 'build/f_isoroot/Makefile')
| -rw-r--r-- | build/f_isoroot/Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 1539783c9..db85916c5 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -9,23 +9,24 @@ ############################################################################## # Add Fuel plugin build targets here -# Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have +# Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have # verified it! -PLUGINS ?= f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild f_collectd-ceilometer-pluginbuild f_tacker-pluginbuild -#PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild +PLUGINS = export PLUGINS -#NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild +NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins # indicated therein. # Temporarilu disabling f_repobuild that currently have some issues on -# Fuel Mitaka. +# Fuel Newton. ifdef BUILD_FUEL_PLUGINS export BUILD_FUEL_PLUGINS -SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS) +#SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS) +SUBDIRS = f_kscfg f_bootstrap f_isolinux $(BUILD_FUEL_PLUGINS) $(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS)) else -SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(PLUGINS) +#SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(PLUGINS) +SUBDIRS = f_kscfg f_bootstrap f_isolinux $(PLUGINS) endif SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) |