Merge "fuel-plugin-odl: Fix deploy on x64 due to leveldb"
[armband.git] / patches / opnfv-fuel / 0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch
1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2 Date: Tue, 24 Jan 2017 19:59:52 +0100
3 Subject: [PATCH] f_odlpluginbuild: Always inherit Armband settings
4
5 This should eliminate any possible confusion when building the
6 ODL plugin manually (outside OPNFV ISO build), which used to
7 require setting up some additional enviroment variables, like
8 UBUNTU_ARCH.
9
10 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
11 ---
12  build/f_isoroot/f_odlpluginbuild/Makefile | 5 +++++
13  1 file changed, 5 insertions(+)
14
15 diff --git a/build/f_isoroot/f_odlpluginbuild/Makefile b/build/f_isoroot/f_odlpluginbuild/Makefile
16 index d3a7ea8..4c77abc 100644
17 --- a/build/f_isoroot/f_odlpluginbuild/Makefile
18 +++ b/build/f_isoroot/f_odlpluginbuild/Makefile
19 @@ -9,6 +9,11 @@
20
21  TOP := $(shell pwd)
22
23 +# Configure Armband specific stuff when ARMBAND_BASE is set
24 +ifdef ARMBAND_BASE
25 +    include ${ARMBAND_BASE}/armband-fuel-config.mk
26 +endif
27 +
28  include config.mk
29
30  .PHONY: all