aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordongfeng <albert.dongfeng@huawei.com>2016-01-25 08:08:55 -0500
committerStefan Berg <sfb@consultron.com>2016-01-29 14:38:56 +0100
commit612a4345ed5593f264bd075ea533b11e889819b3 (patch)
treed0d029b8974b5f145ef1b5d1974824a2ea1f9a0b
parente9ea89ccb4017ce838d1e86b6cd97a0b6f7f1f82 (diff)
onosfw plugin for 8.0
Change-Id: I7804986242e9e2ac556a17b3475e7af48cec2756 (cherry picked from commit 5b7ac299f8ed8235fc891db4eedfa55ef26fc52e)
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_onosfwpluginbuild/config.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index d59908a61..735a6a462 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -9,7 +9,7 @@
##############################################################################
# Add Fuel plugin build targets here
-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild
+PLUGINS = f_odlpluginbuild f_onosfwpluginbuild
#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
diff --git a/build/f_isoroot/f_onosfwpluginbuild/config.mk b/build/f_isoroot/f_onosfwpluginbuild/config.mk
index e41a1ada3..f521b821b 100644
--- a/build/f_isoroot/f_onosfwpluginbuild/config.mk
+++ b/build/f_isoroot/f_onosfwpluginbuild/config.mk
@@ -7,5 +7,5 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-ONOS_BRANCH=Kilo
+ONOS_BRANCH=Liberty
ONOS_REPO=git://git.openstack.org/openstack/fuel-plugin-onos