From cc5fb9ba3de5c2d45580dcaa547a768499b70ab6 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 24 Jan 2017 19:38:40 +0100 Subject: fuel-plugin-odl: Uplift OpenDaylight to Fuel10 JIRA: ARMBAND-202 Change-Id: Ife5a5a34f272cb77dc88c2f927d4129e025a3846 Signed-off-by: Alexandru Avadanii --- ...uginbuild-Always-inherit-Armband-settings.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 patches/opnfv-fuel/0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch (limited to 'patches') 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 +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 +--- + 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 -- cgit 1.2.3-korg