summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2018-08-28 10:25:08 +0200
committerKarel Kočí <karel.koci@nic.cz>2018-08-28 10:26:10 +0200
commit4fb1e1ccb7825c4ae42d98c882978281868974d2 (patch)
treebe5e989c9843c3dda69c0eea8f2ef3e14135a3b8
parent12ae05f4610735d7867712f347a5371844f525c8 (diff)
downloadlaminar-cnf-4fb1e1ccb7825c4ae42d98c882978281868974d2.tar.gz
laminar-cnf-4fb1e1ccb7825c4ae42d98c882978281868974d2.tar.bz2
laminar-cnf-4fb1e1ccb7825c4ae42d98c882978281868974d2.zip
Revert "turris4x: Another try to fix package/index build"
This reverts commit 7df49f45b20776808205191ccc50452b121925f6.
-rwxr-xr-xtemplates/turris4x.run6
1 files changed, 2 insertions, 4 deletions
diff --git a/templates/turris4x.run b/templates/turris4x.run
index 67844cf..bbc8551 100755
--- a/templates/turris4x.run
+++ b/templates/turris4x.run
@@ -18,7 +18,7 @@ else
echo_info "Building new version of SDK"
echo_stage "Get turris-build"
- HASH="$( | awk '/ \* turris-build\: /{print $3}')"
+ HASH="$(awk '/ \* turris-build\: /{print $3}' git-hash)"
HASH="9544f32cf06c29aedf8c3d88b9ff8745179dfa69" # TODO remove this when repo_checkout is integrated
git_fetch "https://gitlab.labs.nic.cz/turris/turris-build.git" turris-build "$HASH"
@@ -53,9 +53,7 @@ echo_stage "Compile packages from our feed"
$MAKE $(./scripts/feeds list -r personal | sed -n 's/^\([^ ]*\).*$/package\/\1\/compile/p' | tr '\n' ' ')
echo_stage "Generate index and sign"
-cp ~/openwrt-repo.key key-build
-$MAKE -j1 V=99 package/index
-rm key-build
+$MAKE -j1 V=99 package/index BUILD_KEY=~/openwrt-repo.key
echo_stage "Deploy"
ssh upload rm -rf "deploy-turris4x-$BOARD"