summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Berg <stefan.k.berg@ericsson.com>2016-01-29 13:29:24 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-29 13:29:24 +0000
commita9a74a47a32c57d664c4db540b6019292345318d (patch)
tree8f9c3012cb2909c7fd71a1f9ef4a8ed727442ccc
parent9626f589b3c8182307a2de624a1c97b1181eecc3 (diff)
parent77b2a5dd846bb1f805a97581bd32238cda4cba78 (diff)
Merge "All plug-ins except those explicitly rebased are disabled" into stable/brahmaputra
-rw-r--r--build/f_isoroot/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index ec0db48a3..babb5d68d 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -9,7 +9,8 @@
##############################################################################
# Add Fuel plugin build targets here
-PLUGINS = f_odlpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfwpluginbuild f_bgpvpn-pluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild
+PLUGINS = f_odlpluginbuild
+#NON_8-0_REBASED_PLUGINS = f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfwpluginbuild f_bgpvpn-pluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild
# If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
# indicated therein.