diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-08-06 15:18:26 +1000 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-08-06 15:18:32 +1000 |
| commit | 94ec86a40d9a58cee8e8333229e15fff8a19d64d (patch) | |
| tree | a19893a1de4c0d89aad30c48b7e6045c5fdd8f47 /ci | |
| parent | ae0d13e59693667b45dcce12a9229346b7266f33 (diff) | |
| download | talos-op-build-94ec86a40d9a58cee8e8333229e15fff8a19d64d.tar.gz talos-op-build-94ec86a40d9a58cee8e8333229e15fff8a19d64d.zip | |
ci: Set BR2_DL_DIR & BR2_CCACHE_DIR
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build-all-defconfigs.sh | 5 | ||||
| -rwxr-xr-x | ci/build.sh | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/ci/build-all-defconfigs.sh b/ci/build-all-defconfigs.sh index f8b1cd4a..92db7881 100755 --- a/ci/build-all-defconfigs.sh +++ b/ci/build-all-defconfigs.sh @@ -30,6 +30,11 @@ fi shopt -s expand_aliases source op-build-env +if [ -n "$DL_DIR" ]; then + unset BR2_DL_DIR + export BR2_DL_DIR=${DL_DIR} +fi + for i in ${DEFCONFIGS[@]}; do op-build $i echo 'BR2_CCACHE=y' >> output/.config diff --git a/ci/build.sh b/ci/build.sh index 45da32c9..42914146 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -88,6 +88,12 @@ do PROXY="RUN echo \"Acquire::http::Proxy \\"\"${http_proxy}/\\"\";\" > /etc/apt/apt.conf.d/000apt-cacher-ng-proxy" fi fi + if [[ -n "DL_DIR" ]]; then + DL_DIR_ENV="ENV DL_DIR $DL_DIR" + fi + if [[ -n "CCACHE_DIR" ]]; then + CCACHE_DIR_ENV="ENV CCACHE_DIR $CCACHE_DIR" + fi Dockerfile=$(head -n1 $base_dockerfile; echo ${PROXY}; tail -n +2 $base_dockerfile; cat << EOF ${PROXY} @@ -95,6 +101,8 @@ RUN useradd -d ${HOME} -m -u ${UID} ${USER} ENV HOME ${HOME} ${HTTP_PROXY_ENV} ${HTTPS_PROXY_ENV} +${DL_DIR_ENV} +${CCACHE_DIR_ENV} EOF ) $DOCKER_PREFIX docker build --network=host -t openpower/op-build-$distro - <<< "${Dockerfile}" |
