Merge "net-check: add support for faulty operstate"

[armband.git] / patches / opnfv-fuel / 0043-build-Add-armband.mk-config.patch

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 4a31258..df1bd11 100644 (file)
--- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
+++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
@@ -51,7 +51,7 @@ new file mode 100644
 index 0000000..1e772f0
 --- /dev/null
 +++ b/build/armband.mk
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,54 @@
 +##############################################################################
 +# Copyright (c) 2016 Enea AB and others.
 +# Alexandru.Avadanii@enea.com
@@ -70,6 +70,11 @@ index 0000000..1e772f0
 +    export MIRROR_MOS_UBUNTU := linux.enea.com
 +    export EXTRA_RPM_REPOS   := armband,http://linux.enea.com/mos-repos/centos/mos9.0-centos7/armband/x86_64,10
 +
++    # Temporary fuel-plugin-builder repo info for runtime patching
++    export FPB_REPO      := https://github.com/openstack/fuel-plugins
++    export FPB_BRANCH    := master
++    export FPB_CHANGE    := refs/changes/31/311031/2
++
 +    # Armband git submodules for Fuel/OPNFV components
 +    export ASTUTE_REPO   := ${ARMBAND_BASE}/upstream/fuel-astute
 +    export ASTUTE_COMMIT := HEAD
@@ -89,9 +94,9 @@ index 0000000..1e772f0
 +    export FUELLIB_REPO   := ${ARMBAND_BASE}/upstream/fuel-library
 +    export FUELLIB_COMMIT := HEAD
 +
-+    export ODL_REPO   := ${ARMBAND_BASE}/upstream/fuel-plugin-opendaylight
-+    export ODL_BRANCH := armband-workbench
-+    export ODL_CHANGE := HEAD
++    export FUEL_PLUGIN_ODL_REPO        := ${ARMBAND_BASE}/upstream/fuel-plugin-opendaylight
++    export FUEL_PLUGIN_ODL_BRANCH      := armband-workbench
++    export FUEL_PLUGIN_ODL_CHANGE      := HEAD
 +    export OPNFV_QUAGGE_PACKAGING_REPO := https://github.com/alexandruavadanii/opnfv-quagga-packaging
 +
 +    export OVS_NSH_DPDK_REPO   := ${ARMBAND_BASE}/upstream/fuel-plugin-ovs
@@ -100,10 +105,6 @@ index 0000000..1e772f0
 +    export VSPERF_REPO   := ${ARMBAND_BASE}/upstream/vswitchperf
 +    export VSPERF_BRANCH := armband-workbench
 +    export VSPERF_CHANGE := HEAD
-+
-+    export YARDSTICK_REPO   := ${ARMBAND_BASE}/upstream/yardstick
-+    export YARDSTICK_BRANCH := armband-workbench
-+    export YARDSTICK_CHANGE := HEAD
 +endif
 diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
 index b38ea4c..624f233 100644