diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-24 19:38:40 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-25 17:34:08 +0100 |
| commit | cc5fb9ba3de5c2d45580dcaa547a768499b70ab6 (patch) | |
| tree | f2a919244770da98809e4803aa025449322a7b22 | |
| parent | 59b095b6688e8b628ede44c282f8699bd21e4c83 (diff) | |
fuel-plugin-odl: Uplift OpenDaylight to Fuel10
JIRA: ARMBAND-202
Change-Id: Ife5a5a34f272cb77dc88c2f927d4129e025a3846
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rw-r--r-- | armband-fuel-config.mk | 6 | ||||
| -rw-r--r-- | patches/opnfv-fuel/0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch | 30 |
2 files changed, 32 insertions, 4 deletions
diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk index aceafd3a..6f29f474 100644 --- a/armband-fuel-config.mk +++ b/armband-fuel-config.mk @@ -23,8 +23,8 @@ ARMBAND_TRACK_REMOTES ?= yes # Armband plugins, supported archs & specific info # FIXME(alav): re-enable for D release after rebasing to Newton -#export PLUGINS := f_odlpluginbuild f_bgpvpn-pluginbuild f_ovs-nsh-dpdk-pluginbuild f_tacker-pluginbuild f_yardstick-pluginbuild -export PLUGINS := f_yardstick-pluginbuild f_congress-pluginbuild +#export PLUGINS := f_bgpvpn-pluginbuild f_ovs-nsh-dpdk-pluginbuild f_tacker-pluginbuild +export PLUGINS := f_yardstick-pluginbuild f_congress-pluginbuild f_odlpluginbuild export UBUNTU_ARCH := amd64 arm64 export PRODNO := OPNFV_A_FUEL export MIRROR_MOS_UBUNTU := linux.enea.com @@ -39,8 +39,6 @@ export FPB_CHANGE := refs/changes/31/311031/2 export FUEL_PLUGIN_ODL_REPO := ${ARMBAND_BASE}/upstream/fuel-plugin-opendaylight export FUEL_PLUGIN_ODL_BRANCH := opnfv-armband export FUEL_PLUGIN_ODL_CHANGE := ${A_OPNFV_TAG} -# FIXME(alav): rebase to Newton and update ref -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 := opnfv-armband diff --git a/patches/opnfv-fuel/0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch b/patches/opnfv-fuel/0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch new file mode 100644 index 00000000..29ea6346 --- /dev/null +++ b/patches/opnfv-fuel/0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch @@ -0,0 +1,30 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 24 Jan 2017 19:59:52 +0100 +Subject: [PATCH] f_odlpluginbuild: Always inherit Armband settings + +This should eliminate any possible confusion when building the +ODL plugin manually (outside OPNFV ISO build), which used to +require setting up some additional enviroment variables, like +UBUNTU_ARCH. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + build/f_isoroot/f_odlpluginbuild/Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile +index d3a7ea8..4c77abc 100644 +--- a/build/f_isoroot/f_odlpluginbuild/Makefile ++++ b/build/f_isoroot/f_odlpluginbuild/Makefile +@@ -9,6 +9,11 @@ + + TOP := $(shell pwd) + ++# Configure Armband specific stuff when ARMBAND_BASE is set ++ifdef ARMBAND_BASE ++ include ${ARMBAND_BASE}/armband-fuel-config.mk ++endif ++ + include config.mk + + .PHONY: all |