diff options
author | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-05-31 14:49:36 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-31 14:49:36 +0000 |
commit | ec0c7698cd363b71694ca33e87f65fc382acda8d (patch) | |
tree | 3472b6dbb13612ce59f00c8ef1630fd9c3ed25ed /build/f_isoroot/Makefile | |
parent | ebb5b355ba542fc22b8f96f952439251d4b2c90b (diff) | |
parent | 6d672885e96f25309ef36da9a6b3c93968ec0c5e (diff) |
Merge "Build system uplift to Fuel 9.0/Mitaka"
Diffstat (limited to 'build/f_isoroot/Makefile')
-rw-r--r-- | build/f_isoroot/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 878278942..20d2fb0b0 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -9,20 +9,24 @@ ############################################################################## # Add Fuel plugin build targets here -PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild +# Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have +# verified it! +PLUGINS = +#PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild export PLUGINS #NON_8-0_REBASED_PLUGINS = 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 8. +# Fuel Mitaka. 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 $(PLUGINS) endif SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) |