diff options
| author | Karel Kočí <cynerd@email.cz> | 2019-09-21 17:16:07 +0200 |
|---|---|---|
| committer | Karel Kočí <cynerd@email.cz> | 2019-09-21 17:16:07 +0200 |
| commit | 730278d1b5af4a29e26f5f1c83da211e0aa48aa8 (patch) | |
| tree | 8343529f856eb4b886d56851aaf4b705b0ea9e95 /templates | |
| parent | 392150cea35e3cce0e3daac35dc1b4c7fa67074a (diff) | |
| download | laminar-cnf-730278d1b5af4a29e26f5f1c83da211e0aa48aa8.tar.gz laminar-cnf-730278d1b5af4a29e26f5f1c83da211e0aa48aa8.tar.bz2 laminar-cnf-730278d1b5af4a29e26f5f1c83da211e0aa48aa8.zip | |
Drop Turris OS 3.x builds and add Turris 1.x
Diffstat (limited to 'templates')
| -rwxr-xr-x | templates/turris.run | 9 | ||||
| -rwxr-xr-x | templates/turris3x.run | 38 |
2 files changed, 8 insertions, 39 deletions
diff --git a/templates/turris.run b/templates/turris.run index 01a56d5..e5306e9 100755 --- a/templates/turris.run +++ b/templates/turris.run @@ -1,7 +1,14 @@ #!/bin/sh # vim: ft=sh . "$(dirname "$(readlink -f "$0")")/../job.common" -. turris-common.sh +################################################### +parallel=-j4 +make="make -j4 IS_TTY=1 BUILD_LOG=1" +if [ "$V" -ge 1 ]; then + parallel=-j1 + make="make -j1 IS_TTY=1 BUILD_LOG=1 V=99" +fi +################################################### curl "https://repo.turris.cz/$ANIMAL/$BOARD/packages/git-hash" > git-hash cat git-hash diff --git a/templates/turris3x.run b/templates/turris3x.run deleted file mode 100755 index b9344d8..0000000 --- a/templates/turris3x.run +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# vim: ft=sh -. "$(dirname "$(readlink -f "$0")")/../job.common" -. turris-common.sh - -echo_stage "Get packages" -git_clone "git@cynerd.cz:openwrt-personal-pkgs" pkgs turris3x - -SDK="$WORKSPACE/sdk.tar.bz2" -if [ -n "$CLEAN" ] || [ ! -e "$SDK" ] || [ $(expr $(date -u +%s) - $(stat -c %Z "$SDK")) -gt 86400 ]; then - echo_stage "Download SDK" - curl "$SDK_URI" > sdk.tar.bz2 - mv sdk.tar.bz2 "$SDK" -else - echo_stage "Skipping download" -fi - -echo_stage "Export SDK" -tar -xjf "$WORKSPACE/sdk.tar.bz2" -cd OpenWrt-SDK-* - -echo_stage "Copy packages" -cp -r ../pkgs/* package/ - -echo_stage "Build" -$make - -echo_stage "Sign" -./staging_dir/host/bin/usign -S -s ~/openwrt-repo.sec -m "bin/$ARCH/packages/base/Packages" - -echo_stage "Deploy" -ssh upload rm -rf "deploy-turris3x-$BOARD" -scp -r "bin/$ARCH/packages/base" upload:deploy-turris3x-$BOARD -ssh upload /bin/sh -e <<EOF - mkdir -p /var/www/repo/turris3x - rm -rf /var/www/repo/turris3x/$BOARD - mv deploy-turris3x-$BOARD /var/www/repo/turris3x/$BOARD -EOF |