summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-01-24 19:38:40 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-01-25 17:34:08 +0100
commitcc5fb9ba3de5c2d45580dcaa547a768499b70ab6 (patch)
treef2a919244770da98809e4803aa025449322a7b22 /patches/opnfv-fuel
parent59b095b6688e8b628ede44c282f8699bd21e4c83 (diff)
fuel-plugin-odl: Uplift OpenDaylight to Fuel10
JIRA: ARMBAND-202 Change-Id: Ife5a5a34f272cb77dc88c2f927d4129e025a3846 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch30
1 files changed, 30 insertions, 0 deletions
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