summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot
diff options
context:
space:
mode:
authorRuijing Guo <ruijing.guo@intel.com>2016-01-26 03:23:03 +0000
committerStefan Berg <sfb@consultron.com>2016-01-29 14:41:11 +0100
commit5aa0078848414d6492118f9c6d533c5de3d70bf6 (patch)
tree896554675c51fcb1c088ced18739e484ae141a40 /build/f_isoroot
parenteab4156c29823880c19844fef53d394ce82eb433 (diff)
Rebase Fuel OVS & QEMU plugin to Fuel 8.0
Change-Id: I73a3e5e64d7987c773d3f543f6ad94cdf96d2bdb Signed-off-by: Ruijing Guo <ruijing.guo@intel.com> (cherry picked from commit 108cdaacf2e3cc1febabc10cead78b1120e9156b)
Diffstat (limited to 'build/f_isoroot')
-rw-r--r--build/f_isoroot/Makefile4
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk2
-rw-r--r--build/f_isoroot/f_qemupluginbuild/config.mk2
3 files changed, 4 insertions, 4 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 9e1a9ecb3..703d85a0b 100644
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -9,8 +9,8 @@
##############################################################################
# Add Fuel plugin build targets here
-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild
-#NON_8-0_REBASED_PLUGINS = f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_onosfwpluginbuild f_bgpvpn-pluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild
+PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild
+#NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
# If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
# indicated therein.
diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
index 5d37aee5a..91820807d 100644
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
@@ -7,6 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-OVS_NSH_DPDK_BRANCH=3776734a7b93ac440aa7b2e730d743b8510aac25
+OVS_NSH_DPDK_BRANCH=27eaf16ac1ca2849f85e85e969c6e322c8cb42ae
OVS_NSH_DPDK_REPO=https://review.openstack.org/openstack/fuel-plugin-ovs
OVS_NSH_DPDK_CHANGE=
diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk
index 33ef0c176..e98527c34 100644
--- a/build/f_isoroot/f_qemupluginbuild/config.mk
+++ b/build/f_isoroot/f_qemupluginbuild/config.mk
@@ -7,6 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-QEMU_BRANCH=77933feb081ae8668865b7a4db5549b44865a154
+QEMU_BRANCH=dcb7040adfb1c9efe5e93bbb37ea4090f577604c
QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
QEMU_CHANGE=