From 9ac1e585f688c62ed5028a46b46d4bead1b66963 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 19 Nov 2016 17:31:04 +0100 Subject: fuel-plugin-ovs: Fix missing git change Upstream Fuel@OPNFV recently set the git change for upstream fuel-plugin-ovs git repo, aside from setting branch to stable/9.0. This led to Armband patches being silently ignored and building an "amd64"-only version of the OVS plugin in Armband. NOTE: Since Armband uses git submodules to track the patches plugins, including fuel-plugin-ovs, we automatically fetch latest branch HEAD from upstream plugins (by using `git submodules update --remote`), so the Fuel recent pinning is bypassed anyway. JIRA: ARMBAND-166 Change-Id: Ide96f16f9b2577fc184c759dd153298df0be24c6 Signed-off-by: Alexandru Avadanii --- patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch | 5 +++-- upstream/fuel-plugin-ovs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch index 20642fc3..ba3de56a 100644 --- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch +++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch @@ -49,7 +49,7 @@ new file mode 100644 index 0000000..1e772f0 --- /dev/null +++ b/build/armband.mk -@@ -0,0 +1,54 @@ +@@ -0,0 +1,55 @@ +############################################################################## +# Copyright (c) 2016 Enea AB and others. +# Alexandru.Avadanii@enea.com @@ -98,7 +98,8 @@ index 0000000..1e772f0 + export OPNFV_QUAGGE_PACKAGING_REPO := https://github.com/alexandruavadanii/opnfv-quagga-packaging + + export OVS_NSH_DPDK_REPO := ${ARMBAND_BASE}/upstream/fuel-plugin-ovs -+ export OVS_NSH_DPDK_BRANCH := HEAD ++ export OVS_NSH_DPDK_BRANCH := armband-workbench ++ export OVS_NSH_DPDK_CHANGE := HEAD + + export VSPERF_REPO := ${ARMBAND_BASE}/upstream/vswitchperf + export VSPERF_BRANCH := armband-workbench diff --git a/upstream/fuel-plugin-ovs b/upstream/fuel-plugin-ovs index 0c85aa25..7d90856a 160000 --- a/upstream/fuel-plugin-ovs +++ b/upstream/fuel-plugin-ovs @@ -1 +1 @@ -Subproject commit 0c85aa25efd3f47008effe9f469d86073df18e12 +Subproject commit 7d90856a02fce1a379dcaf2c32dd9d5f6088c229 -- cgit 1.2.3-korg