Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix ssl cert upload path"
[fuel.git]
/
build
/
f_isoroot
/
Makefile
diff --git
a/build/f_isoroot/Makefile
b/build/f_isoroot/Makefile
index
e189e16
..
0e203bb
100644
(file)
--- a/
build/f_isoroot/Makefile
+++ b/
build/f_isoroot/Makefile
@@
-9,24
+9,18
@@
##############################################################################
# Add Fuel plugin build targets here
##############################################################################
# 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
+PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_tacker-pluginbuild f_onosfwpluginbuild
export PLUGINS
export PLUGINS
-NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild
+
# If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
# indicated therein.
# 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 Newton.
ifdef BUILD_FUEL_PLUGINS
export BUILD_FUEL_PLUGINS
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 $(BUILD_FUEL_PLUGINS)
+SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS)
$(warning Overriding plugin build selection to $(BUILD_FUEL_PLUGINS))
else
$(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)
+SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(PLUGINS)
endif
SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
endif
SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))