aboutsummaryrefslogtreecommitdiffstats
path: root/build/f_isoroot/Makefile
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-10-12 16:42:35 +0200
committerStefan K. Berg <stefan.k.berg@ericsson.com>2016-11-15 15:35:15 +0100
commit9f8aff6636e0d86834178b461802f3e7cb95189d (patch)
tree3bbfec85cda9774295b5f30f8417ee36e512368d /build/f_isoroot/Makefile
parent38579142c683dbf26a6560d53d900111f4df4f6b (diff)
Uplift to Fuel 10.0/Newton
Build working, automated deploy working (simple test cases only). All plugins disabled, so is the generation of the local ISO cache. Both need to be re-enabled after merge of this uplift. All patches wiped, pertinent ones need to be re-enabled after the merge of this uplift. Change-Id: I978a3d4ed25a45a4b88a6e35693baac597b162c2 Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'build/f_isoroot/Makefile')
-rw-r--r--build/f_isoroot/Makefile15
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))