From 730278d1b5af4a29e26f5f1c83da211e0aa48aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 21 Sep 2019 17:16:07 +0200 Subject: Drop Turris OS 3.x builds and add Turris 1.x --- crontab | 4 ++-- jobs/turris-dragons-turris1x.conf | 1 + jobs/turris-dragons-turris1x.env | 3 +++ jobs/turris-dragons-turris1x.run | 1 + jobs/turris-kittens-turris1x.conf | 1 + jobs/turris-kittens-turris1x.env | 3 +++ jobs/turris-kittens-turris1x.run | 1 + jobs/turris3x-omnia.conf | 1 - jobs/turris3x-omnia.env | 3 --- jobs/turris3x-omnia.run | 1 - jobs/turris3x-turris.conf | 1 - jobs/turris3x-turris.env | 3 --- jobs/turris3x-turris.run | 1 - scripts/turris-common.sh | 6 ------ templates/turris.run | 9 ++++++++- templates/turris3x.run | 38 -------------------------------------- 16 files changed, 20 insertions(+), 57 deletions(-) create mode 120000 jobs/turris-dragons-turris1x.conf create mode 100644 jobs/turris-dragons-turris1x.env create mode 120000 jobs/turris-dragons-turris1x.run create mode 120000 jobs/turris-kittens-turris1x.conf create mode 100644 jobs/turris-kittens-turris1x.env create mode 120000 jobs/turris-kittens-turris1x.run delete mode 120000 jobs/turris3x-omnia.conf delete mode 100644 jobs/turris3x-omnia.env delete mode 120000 jobs/turris3x-omnia.run delete mode 120000 jobs/turris3x-turris.conf delete mode 100644 jobs/turris3x-turris.env delete mode 120000 jobs/turris3x-turris.run delete mode 100644 scripts/turris-common.sh delete mode 100755 templates/turris3x.run diff --git a/crontab b/crontab index 1ee6c11..8616bf9 100644 --- a/crontab +++ b/crontab @@ -3,7 +3,7 @@ 0 1 * * * LAMINAR_REASON="Periodic" laminarc queue alpine-armhf 0 2 * * * LAMINAR_REASON="Periodic" laminarc queue turris-dragons-mox 0 2 * * * LAMINAR_REASON="Periodic" laminarc queue turris-dragons-omnia +0 2 * * * LAMINAR_REASON="Periodic" laminarc queue turris-dragons-turris1x 0 2 * * * LAMINAR_REASON="Periodic" laminarc queue turris-kittens-mox 0 2 * * * LAMINAR_REASON="Periodic" laminarc queue turris-kittens-omnia -0 2 * * * LAMINAR_REASON="Periodic" laminarc queue turris3x-omnia -0 2 * * * LAMINAR_REASON="Periodic" laminarc queue turris3x-turris +0 2 * * * LAMINAR_REASON="Periodic" laminarc queue turris-kittens-turris1x diff --git a/jobs/turris-dragons-turris1x.conf b/jobs/turris-dragons-turris1x.conf new file mode 120000 index 0000000..fafbc63 --- /dev/null +++ b/jobs/turris-dragons-turris1x.conf @@ -0,0 +1 @@ +../templates/turris.conf \ No newline at end of file diff --git a/jobs/turris-dragons-turris1x.env b/jobs/turris-dragons-turris1x.env new file mode 100644 index 0000000..8470982 --- /dev/null +++ b/jobs/turris-dragons-turris1x.env @@ -0,0 +1,3 @@ +BOARD=turris1x +ANIMAL=hbd +ARCH=powerpc_8540 diff --git a/jobs/turris-dragons-turris1x.run b/jobs/turris-dragons-turris1x.run new file mode 120000 index 0000000..683ec07 --- /dev/null +++ b/jobs/turris-dragons-turris1x.run @@ -0,0 +1 @@ +../templates/turris.run \ No newline at end of file diff --git a/jobs/turris-kittens-turris1x.conf b/jobs/turris-kittens-turris1x.conf new file mode 120000 index 0000000..fafbc63 --- /dev/null +++ b/jobs/turris-kittens-turris1x.conf @@ -0,0 +1 @@ +../templates/turris.conf \ No newline at end of file diff --git a/jobs/turris-kittens-turris1x.env b/jobs/turris-kittens-turris1x.env new file mode 100644 index 0000000..c4e4b5b --- /dev/null +++ b/jobs/turris-kittens-turris1x.env @@ -0,0 +1,3 @@ +BOARD=turris1x +ANIMAL=hbk +ARCH=powerpc_8540 diff --git a/jobs/turris-kittens-turris1x.run b/jobs/turris-kittens-turris1x.run new file mode 120000 index 0000000..683ec07 --- /dev/null +++ b/jobs/turris-kittens-turris1x.run @@ -0,0 +1 @@ +../templates/turris.run \ No newline at end of file diff --git a/jobs/turris3x-omnia.conf b/jobs/turris3x-omnia.conf deleted file mode 120000 index fafbc63..0000000 --- a/jobs/turris3x-omnia.conf +++ /dev/null @@ -1 +0,0 @@ -../templates/turris.conf \ No newline at end of file diff --git a/jobs/turris3x-omnia.env b/jobs/turris3x-omnia.env deleted file mode 100644 index 85fca4b..0000000 --- a/jobs/turris3x-omnia.env +++ /dev/null @@ -1,3 +0,0 @@ -BOARD=omnia -ARCH=mvebu-musl -SDK_URI=https://repo.turris.cz/omnia-nightly/OpenWrt-SDK-mvebu_gcc-4.8-linaro_musl-1.1.15_eabi.Linux-x86_64.tar.bz2 diff --git a/jobs/turris3x-omnia.run b/jobs/turris3x-omnia.run deleted file mode 120000 index 7171463..0000000 --- a/jobs/turris3x-omnia.run +++ /dev/null @@ -1 +0,0 @@ -../templates/turris3x.run \ No newline at end of file diff --git a/jobs/turris3x-turris.conf b/jobs/turris3x-turris.conf deleted file mode 120000 index fafbc63..0000000 --- a/jobs/turris3x-turris.conf +++ /dev/null @@ -1 +0,0 @@ -../templates/turris.conf \ No newline at end of file diff --git a/jobs/turris3x-turris.env b/jobs/turris3x-turris.env deleted file mode 100644 index a6b3555..0000000 --- a/jobs/turris3x-turris.env +++ /dev/null @@ -1,3 +0,0 @@ -BOARD=turris -ARCH=mpc85xx -SDK_URI=https://repo.turris.cz/turris-nightly/OpenWrt-SDK-mpc85xx-p2020-nand_gcc-4.8-linaro_uClibc-0.9.33.2.Linux-x86_64.tar.bz2 diff --git a/jobs/turris3x-turris.run b/jobs/turris3x-turris.run deleted file mode 120000 index 7171463..0000000 --- a/jobs/turris3x-turris.run +++ /dev/null @@ -1 +0,0 @@ -../templates/turris3x.run \ No newline at end of file diff --git a/scripts/turris-common.sh b/scripts/turris-common.sh deleted file mode 100644 index fafcc82..0000000 --- a/scripts/turris-common.sh +++ /dev/null @@ -1,6 +0,0 @@ -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 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 <