blob: 724ee9c43c1a9f69d3ccb4ff1b635e0f4cc15611 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
: Copyright (c) 2017 Enea AB and others.
:
: All rights reserved. This program and the accompanying materials
: are made available under the terms of the Apache License, Version 2.0
: which accompanies this distribution, and is available at
: http://www.apache.org/licenses/LICENSE-2.0
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
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
|
