1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2017 Enea AB and others.
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
10 Date: Thu, 11 Aug 2016 15:34:32 +0200
11 Subject: [PATCH] build: Add ARMBAND_BASE support
13 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
15 build/Makefile | 10 ++++++++++
16 build/docker/Dockerfile | 2 +-
17 build/docker/runcontext | 6 +++++-
18 3 files changed, 18 insertions(+), 2 deletions(-)
20 diff --git a/build/Makefile b/build/Makefile
21 index 4454c35..377ecc6 100644
24 @@ -14,4 +14,9 @@ SHELL = /bin/bash
26 +# Only configure Armband specific stuff when ARMBAND_BASE is set
28 + include ${ARMBAND_BASE}/armband-fuel-config.mk
31 ############################################################################
32 # BEGIN of variables to customize
34 @@ -140,6 +140,7 @@ $(ISOCACHE):
35 # fuel-main Makefiles do not like `make -C`
36 cd $(FUEL_MAIN_DIR) && make repos
37 cp f_repos/.cachefuelinfo gitinfo_fuel.txt
38 + test -z $(ARMBAND_BASE) || $(REPOINFO) $(ARMBAND_BASE) >> gitinfo_fuel.txt
40 # Repeat build up to three times
41 sudo -E ./fuel_build_loop
42 diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
43 index b38ea4c..624f233 100644
44 --- a/build/docker/Dockerfile
45 +++ b/build/docker/Dockerfile
46 @@ -30,7 +30,7 @@ RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC
47 # Keeping PWD is needed to build as root
48 RUN echo "Defaults env_keep += \"PWD\"" > /etc/sudoers.d/keep-pwd
49 # Keeping variables for ISO build
50 -RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU UBUNTU_ARCH\"" > /etc/sudoers.d/keep-mos
51 +RUN echo "Defaults env_keep += \"MIRROR_UBUNTU MIRROR_UBUNTU_ROOT MIRROR_MOS_UBUNTU MIRROR_MOS_UBUNTU_ROOT MIRROR_FUEL LATEST_TARGET_UBUNTU UBUNTU_ARCH ARMBAND_BASE\"" > /etc/sudoers.d/keep-mos
52 RUN chmod 0440 /etc/sudoers.d/open-sudo
53 RUN chmod 0440 /etc/sudoers.d/keep-proxies
54 RUN chmod 0440 /etc/sudoers.d/keep-pwd
55 diff --git a/build/docker/runcontext b/build/docker/runcontext
56 index daad663..e4874df 100755
57 --- a/build/docker/runcontext
58 +++ b/build/docker/runcontext
59 @@ -42,6 +42,10 @@ GITROOT=`git rev-parse --show-toplevel`
60 CID_FILE=`mktemp -u -t runcontext.XXXXXXXXXX`
61 CONTEXT_DIR=`mktemp -d ${GITROOT}/.docker_contextXXXXXX`
63 +if [[ $ARMBAND_BASE ]]; then
64 + GITROOT=$ARMBAND_BASE
67 # If RSYNC_CONNECT_PROG is used, we need to copy all of
68 # the SSH structure, should one of the keys need to be
70 @@ -115,7 +119,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
71 -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \
72 -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \
73 -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
74 - -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA \
75 + -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA -e ARMBAND_BASE \
76 -u $USER_ID:$GROUP_ID -w $PWD \
77 -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"