diff options
| author | Karel Kočí <karel.koci@nic.cz> | 2018-10-11 14:39:01 +0200 |
|---|---|---|
| committer | Karel Kočí <karel.koci@nic.cz> | 2018-10-11 14:39:01 +0200 |
| commit | a237d34158be871f474bbbe1079d6c32fc178bbb (patch) | |
| tree | 5625cd5c3c96be1c3c5116f31642f8ca71ab790f | |
| parent | 97f0af3b6a67175dc28bab477413e446e9a467e7 (diff) | |
| download | laminar-cnf-a237d34158be871f474bbbe1079d6c32fc178bbb.tar.gz laminar-cnf-a237d34158be871f474bbbe1079d6c32fc178bbb.tar.bz2 laminar-cnf-a237d34158be871f474bbbe1079d6c32fc178bbb.zip | |
turris4x: fix how we use compile_fw
Using prepare_tools resets stuff prepared by repo_prepare.
| -rwxr-xr-x | templates/turris4x.run | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/templates/turris4x.run b/templates/turris4x.run index 3b16bc1..4d18de8 100755 --- a/templates/turris4x.run +++ b/templates/turris4x.run @@ -3,11 +3,9 @@ . "$(dirname "$(readlink -f "$0")")/../job.common" if [ "$V" -ge 1 ]; then - njobs="-j1" - make="make $njobs IS_TTY=1 BUILD_LOG=1 V=99" + make="make -j1 IS_TTY=1 BUILD_LOG=1 V=99" else - njobs="-j4" - make="make $njobs IS_TTY=1 BUILD_LOG=1" + make="make -j4 IS_TTY=1 BUILD_LOG=1" fi curl "https://repo.turris.cz/$BOARD-$BRANCH/git-hash" > git-hash @@ -28,7 +26,8 @@ else GIT_MIRROR="$TWORKSPACE/openwrt-git-mirror" \ CCACHE_HOST_DIR="$TWORKSPACE/ccache-host" \ CCACHE_TARGET_DIR="$WORKSPACE/ccache-target" \ - ../turris-build/compile_fw -a "$njobs" -t $BOARD -p $BRANCH repo_prepare prepare_tools + ../turris-build/compile_fw -a "$njobs" -t $BOARD -p $BRANCH repo_prepare + $make toolchain/compile target/compile cd .. tar -czf openwrt.tar.gz openwrt mv openwrt.tar.gz "$WORKSPACE/openwrt.tar.gz" |