diff options
| author | Karel Kočí <cynerd@email.cz> | 2018-10-10 15:50:53 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2018-10-10 15:50:53 +0200 |
| commit | 0e3a0dab9c307be49c4994d31614f9ffb2985771 (patch) | |
| tree | 37253de3364f6bf90ce168b5de27670b7d58665f /templates/turris4x.run | |
| parent | 317cd33405e387a5168ac980d59c3b3269c11a1a (diff) | |
| download | laminar-cnf-0e3a0dab9c307be49c4994d31614f9ffb2985771.tar.gz laminar-cnf-0e3a0dab9c307be49c4994d31614f9ffb2985771.tar.bz2 laminar-cnf-0e3a0dab9c307be49c4994d31614f9ffb2985771.zip | |
turris4x: use compile_fw to compile SDK not plain make
Diffstat (limited to 'templates/turris4x.run')
| -rwxr-xr-x | templates/turris4x.run | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/templates/turris4x.run b/templates/turris4x.run index e53622d..7118362 100755 --- a/templates/turris4x.run +++ b/templates/turris4x.run @@ -3,9 +3,11 @@ . "$(dirname "$(readlink -f "$0")")/../job.common" if [ "$V" -ge 1 ]; then - MAKE="make -j1 IS_TTY=1 BUILD_LOG=1 V=99" + njobs="-j1" + make="make $njobs IS_TTY=1 BUILD_LOG=1 V=99" else - MAKE="make -j4 IS_TTY=1 BUILD_LOG=1" + njobs="-j4" + make="make $njobs IS_TTY=1 BUILD_LOG=1" fi curl "https://repo.turris.cz/$BOARD-$BRANCH/git-hash" > git-hash @@ -27,8 +29,7 @@ else GIT_MIRROR="$TWORKSPACE/openwrt-git-mirror" \ CCACHE_HOST_DIR="$TWORKSPACE/ccache-host" \ CCACHE_TARGET_DIR="$WORKSPACE/ccache-target" \ - ../turris-build/compile_fw -t $BOARD -p $BRANCH repo_prepare - $MAKE tools/compile toolchain/compile target/compile package/usign/host/compile + ../turris-build/compile_fw -a "$njobs" -t $BOARD -p $BRANCH repo_prepare prepare_tools rm -rf build_dir cd .. rm -rf "$WORKSPACE/openwrt-sdk" @@ -45,10 +46,10 @@ echo "src-git personal git@cynerd.cz:openwrt-personal-pkgs" >> feeds.conf ./scripts/feeds install -p personal -d y -f -a echo_stage "Compile packages from personal feed" -$MAKE $(ls package/feeds/personal | sed -n 's/^\([^ ]*\).*$/package\/\1\/compile/p' | tr '\n' ' ') +$make $(ls package/feeds/personal | sed -n 's/^\([^ ]*\).*$/package\/\1\/compile/p' | tr '\n' ' ') echo_stage "Generate index and sign" -$MAKE package/index BUILD_KEY=~/openwrt-repo.key +$make package/index BUILD_KEY=~/openwrt-repo.key echo_stage "Deploy" ssh upload rm -rf "deploy-turris4x-$BOARD" |