1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2 Date: Thu, 11 Aug 2016 15:34:32 +0200
3 Subject: [PATCH] build: Add ARMBAND_BASE support
5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
7 build/Makefile | 10 ++++++++++
8 build/docker/Dockerfile | 2 +-
9 build/docker/runcontext | 6 +++++-
10 3 files changed, 18 insertions(+), 2 deletions(-)
12 diff --git a/build/Makefile b/build/Makefile
13 index 4454c35..377ecc6 100644
16 @@ -14,4 +14,9 @@ SHELL = /bin/bash
18 +# Only configure Armband specific stuff when ARMBAND_BASE is set
20 + include ${ARMBAND_BASE}/armband-fuel-config.mk
23 ############################################################################
24 # BEGIN of variables to customize
26 @@ -140,6 +140,7 @@ $(ISOCACHE):
27 # fuel-main Makefiles do not like `make -C`
28 cd $(FUEL_MAIN_DIR) && make repos
29 cp f_repos/.cachefuelinfo gitinfo_fuel.txt
30 + test -z $(ARMBAND_BASE) || $(REPOINFO) $(ARMBAND_BASE) >> gitinfo_fuel.txt
32 # Repeat build up to three times
33 sudo -E ./fuel_build_loop
34 diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
35 index b38ea4c..624f233 100644
36 --- a/build/docker/Dockerfile
37 +++ b/build/docker/Dockerfile
38 @@ -30,7 +30,7 @@ RUN echo "Defaults env_keep += \"ftp_proxy http_proxy https_proxy no_proxy RSYNC
39 # Keeping PWD is needed to build as root
40 RUN echo "Defaults env_keep += \"PWD\"" > /etc/sudoers.d/keep-pwd
41 # Keeping variables for ISO build
42 -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
43 +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
44 RUN chmod 0440 /etc/sudoers.d/open-sudo
45 RUN chmod 0440 /etc/sudoers.d/keep-proxies
46 RUN chmod 0440 /etc/sudoers.d/keep-pwd
47 diff --git a/build/docker/runcontext b/build/docker/runcontext
48 index daad663..e4874df 100755
49 --- a/build/docker/runcontext
50 +++ b/build/docker/runcontext
51 @@ -42,6 +42,10 @@ GITROOT=`git rev-parse --show-toplevel`
52 CID_FILE=`mktemp -u -t runcontext.XXXXXXXXXX`
53 CONTEXT_DIR=`mktemp -d ${GITROOT}/.docker_contextXXXXXX`
55 +if [[ $ARMBAND_BASE ]]; then
56 + GITROOT=$ARMBAND_BASE
59 # If RSYNC_CONNECT_PROG is used, we need to copy all of
60 # the SSH structure, should one of the keys need to be
62 @@ -115,7 +119,7 @@ RUN_CONTEXT_OPT="--cidfile $CID_FILE --privileged=true --rm \
63 -e HOME=$HOME -e CACHEDEBUG -e CACHETRANSPORT -e CACHEMAXAGE -e CACHEBASE \
64 -e BUILD_FUEL_PLUGINS -e MIRROR_UBUNTU -e MIRROR_UBUNTU_ROOT \
65 -e MIRROR_MOS_UBUNTU -e MIRROR_MOS_UBUNTU_ROOT -e MIRROR_FUEL \
66 - -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA \
67 + -e LATEST_TARGET_UBUNTU -e UBUNTU_ARCH -e OPNFV_GIT_SHA -e ARMBAND_BASE \
68 -u $USER_ID:$GROUP_ID -w $PWD \
69 -v $GITROOT:$GITROOT -v /sys/fs/cgroup:/sys/fs/cgroup:ro $CACHEMOUNT"