summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rwxr-xr-xtemplates/turris.run (renamed from templates/turris4x.run)14
1 files changed, 7 insertions, 7 deletions
diff --git a/templates/turris4x.run b/templates/turris.run
index 96b4497..5f4aeb3 100755
--- a/templates/turris4x.run
+++ b/templates/turris.run
@@ -8,7 +8,7 @@ else
make="make -j4 IS_TTY=1 BUILD_LOG=1"
fi
-curl "https://repo.turris.cz/$BRANCH/packages/$BOARD/git-hash" > git-hash
+curl "https://repo.turris.cz/$ANIMAL/packages/$BOARD/git-hash" > git-hash
cat git-hash
# TODO take lock so we won't run multiple instances of new builds
if [ -z "$CLEAN" ] && [ -f "$WORKSPACE/openwrt-git-hash" ] && cmp -s git-hash "$WORKSPACE/openwrt-git-hash"; then
@@ -30,7 +30,7 @@ DL_MIRROR="$TWORKSPACE/openwrt-dl-mirror"
CCACHE_HOST_DIR="$TWORKSPACE/ccache-host"
CCACHE_TARGET_DIR="$WORKSPACE/ccache-target"
EOF
- ../turris-build/compile_pkgs -e -t "$BOARD" -p "$BRANCH" repo_prepare autopkg
+ ../turris-build/compile_pkgs -e -t "$BOARD" -p "$ANIMAL" repo_prepare autopkg
$make toolchain/compile target/compile package/usign/host/compile
)
tar -czf openwrt.tar.gz openwrt
@@ -53,10 +53,10 @@ echo_stage "Generate index and sign"
$make package/index BUILD_KEY=~/openwrt-repo.key
echo_stage "Deploy"
-ssh upload rm -rf "deploy-turris4x-$BOARD"
-scp -r "bin/packages/$ARCH/personal" upload:deploy-turris4x-$BOARD
+ssh upload rm -rf "deploy-turris-$ANIMAL-$BOARD"
+scp -r "bin/packages/$ARCH/personal" upload:deploy-turris-$BOARD
ssh upload /bin/sh -e <<EOF
- mkdir -p /var/www/repo/turris4x
- rm -rf /var/www/repo/turris4x/$BOARD
- mv deploy-turris4x-$BOARD /var/www/repo/turris4x/$BOARD
+ mkdir -p "/var/www/repo/turris/$ANIMAL"
+ rm -rf "/var/www/repo/turris/$ANIMAL/$BOARD"
+ mv deploy-turris-$ANIMAL-$BOARD "/var/www/repo/turris/$ANIMAL/$BOARD"
EOF