fuel-plugin-ovs: Fix missing git change 75/24575/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 19 Nov 2016 16:31:04 +0000 (17:31 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 19 Nov 2016 16:36:22 +0000 (17:36 +0100)
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 <Alexandru.Avadanii@enea.com>
patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
upstream/fuel-plugin-ovs

index 20642fc..ba3de56 100644 (file)
@@ -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
index 0c85aa2..7d90856 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 0c85aa25efd3f47008effe9f469d86073df18e12
+Subproject commit 7d90856a02fce1a379dcaf2c32dd9d5f6088c229