diff options
Diffstat (limited to 'patches/opnfv-fuel/0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch')
| -rw-r--r-- | patches/opnfv-fuel/0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch | 38 |
1 files changed, 0 insertions, 38 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 deleted file mode 100644 index 724ee9c4..00000000 --- a/patches/opnfv-fuel/0009-f_odlpluginbuild-Always-inherit-Armband-settings.patch +++ /dev/null @@ -1,38 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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 |