From 4ddd4057e2ab91e30f61cfa757605bfd0cca4d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sat, 9 Feb 2019 17:34:28 +0100
Subject: turris: change how we do Turris 4.x

---
 templates/turris.run   | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++
 templates/turris4x.run | 62 --------------------------------------------------
 2 files changed, 62 insertions(+), 62 deletions(-)
 create mode 100755 templates/turris.run
 delete mode 100755 templates/turris4x.run

(limited to 'templates')

diff --git a/templates/turris.run b/templates/turris.run
new file mode 100755
index 0000000..5f4aeb3
--- /dev/null
+++ b/templates/turris.run
@@ -0,0 +1,62 @@
+#!/bin/sh
+# vim: ft=sh
+. "$(dirname "$(readlink -f "$0")")/../job.common"
+
+if [ "$V" -ge 1 ]; then
+	make="make -j1 IS_TTY=1 BUILD_LOG=1 V=99"
+else
+	make="make -j4 IS_TTY=1 BUILD_LOG=1"
+fi
+
+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
+	echo_info "Using previous version of SDK"
+	tar -xzf "$WORKSPACE/openwrt.tar.gz"
+else
+	echo_info "Building new version of SDK"
+	echo_stage "Get turris-build"
+	TB_HASH="$(awk '/ \* turris-build\: /{print $3}' git-hash)"
+	git_fetch_t "https://gitlab.labs.nic.cz/turris/turris-build.git" turris-build "$TB_HASH"
+
+	echo_stage "Prepare SDK"
+	mkdir openwrt
+	(
+	cd openwrt
+	cat > .turris-build.conf <<EOF
+GIT_MIRROR="$TWORKSPACE/openwrt-git-mirror"
+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 "$ANIMAL" repo_prepare autopkg
+	$make toolchain/compile target/compile package/usign/host/compile
+	)
+	tar -czf openwrt.tar.gz openwrt
+	mv openwrt.tar.gz "$WORKSPACE/openwrt.tar.gz"
+	mv git-hash "$WORKSPACE/openwrt-git-hash"
+fi
+cd openwrt
+
+echo_stage "Get personal repository feed"
+echo "src-git personal git@cynerd.cz:openwrt-personal-pkgs" >> feeds.conf
+./scripts/feeds update personal
+./scripts/feeds list -r personal | awk '{print $1}' | xargs ./scripts/feeds uninstall # Remove any package provided by personal feed
+./scripts/feeds install -p personal -d y -f -a
+
+echo_stage "Compile packages from personal feed"
+find package/feeds/personal -mindepth 1 -maxdepth 1 -printf 'package/%P/compile\0' | \
+	xargs --null $make
+
+echo_stage "Generate index and sign"
+$make package/index BUILD_KEY=~/openwrt-repo.key
+
+echo_stage "Deploy"
+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/turris/$ANIMAL"
+	rm -rf "/var/www/repo/turris/$ANIMAL/$BOARD"
+	mv deploy-turris-$ANIMAL-$BOARD "/var/www/repo/turris/$ANIMAL/$BOARD"
+EOF
diff --git a/templates/turris4x.run b/templates/turris4x.run
deleted file mode 100755
index 96b4497..0000000
--- a/templates/turris4x.run
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-# vim: ft=sh
-. "$(dirname "$(readlink -f "$0")")/../job.common"
-
-if [ "$V" -ge 1 ]; then
-	make="make -j1 IS_TTY=1 BUILD_LOG=1 V=99"
-else
-	make="make -j4 IS_TTY=1 BUILD_LOG=1"
-fi
-
-curl "https://repo.turris.cz/$BRANCH/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
-	echo_info "Using previous version of SDK"
-	tar -xzf "$WORKSPACE/openwrt.tar.gz"
-else
-	echo_info "Building new version of SDK"
-	echo_stage "Get turris-build"
-	TB_HASH="$(awk '/ \* turris-build\: /{print $3}' git-hash)"
-	git_fetch_t "https://gitlab.labs.nic.cz/turris/turris-build.git" turris-build "$TB_HASH"
-
-	echo_stage "Prepare SDK"
-	mkdir openwrt
-	(
-	cd openwrt
-	cat > .turris-build.conf <<EOF
-GIT_MIRROR="$TWORKSPACE/openwrt-git-mirror"
-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
-	$make toolchain/compile target/compile package/usign/host/compile
-	)
-	tar -czf openwrt.tar.gz openwrt
-	mv openwrt.tar.gz "$WORKSPACE/openwrt.tar.gz"
-	mv git-hash "$WORKSPACE/openwrt-git-hash"
-fi
-cd openwrt
-
-echo_stage "Get personal repository feed"
-echo "src-git personal git@cynerd.cz:openwrt-personal-pkgs" >> feeds.conf
-./scripts/feeds update personal
-./scripts/feeds list -r personal | awk '{print $1}' | xargs ./scripts/feeds uninstall # Remove any package provided by personal feed
-./scripts/feeds install -p personal -d y -f -a
-
-echo_stage "Compile packages from personal feed"
-find package/feeds/personal -mindepth 1 -maxdepth 1 -printf 'package/%P/compile\0' | \
-	xargs --null $make
-
-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 /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
-EOF
-- 
cgit v1.2.3